summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL8
-rw-r--r--NEWS1
-rwxr-xr-xconfigure18
-rw-r--r--doc/upgrade.html1
4 files changed, 8 insertions, 20 deletions
diff --git a/INSTALL b/INSTALL
index acbd13d..cf1fd35 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,13 +21,7 @@ POSIX.1-2008, available at:
will work for most users.
It will install the binaries in /bin and the static libraries in
-/usr/lib/execline.
-
- Please note that static libraries in /usr/lib/execline *will not*
-be found by a default linker invocation: you need -L/usr/lib/execline.
-Other skarnet.org software automatically handles that case if the
-default configuration is used, but if you change the configuration,
-remember to use the appropriate --with-lib configure option.
+/usr/lib.
You can strip the binaries and libraries of their extra symbols via
"make strip" before the "make install" phase. It will shave a few bytes
diff --git a/NEWS b/NEWS
index 1e386b6..8e5602f 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ In 2.9.6.1
----------
- Bugfixes.
+ - Install static libraries in /usr/lib by default.
In 2.9.6.0
diff --git a/configure b/configure
index 9d368ed..09cd454 100755
--- a/configure
+++ b/configure
@@ -21,12 +21,12 @@ Fine tuning of the installation directories:
--dynlibdir=DIR shared library files [PREFIX/lib]
--bindir=BINDIR user executables [EPREFIX/bin]
--libexecdir=DIR package-scoped executables [EPREFIX/libexec]
- --libdir=DIR static library files [PREFIX/lib/$package]
+ --libdir=DIR static library files [PREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--shebangdir=DIR absolute path for #! invocations [BINDIR]
If no --prefix option is given, by default libdir (but not dynlibdir) will be
- /usr/lib/$package, and includedir will be /usr/include.
+ /usr/lib, and includedir will be /usr/include.
Dependencies:
--with-sysdeps=DIR use sysdeps in DIR [PREFIX/lib/skalibs/sysdeps]
@@ -142,7 +142,7 @@ exec_prefix='$prefix'
dynlibdir='$prefix/lib'
libexecdir='$exec_prefix/libexec'
bindir='$exec_prefix/bin'
-libdir='$prefix/lib/$package'
+libdir='$prefix/lib'
includedir='$prefix/include'
shebangdir='$bindir'
shebangisdefault=true
@@ -216,8 +216,8 @@ done
# Add /usr in the default default case
if test -z "$prefix" ; then
- if test "$libdir" = '$prefix/lib/$package' ; then
- libdir=/usr/lib/$package
+ if test "$libdir" = '$prefix/lib' ; then
+ libdir=/usr/lib
fi
if test "$includedir" = '$prefix/include' ; then
includedir=/usr/include
@@ -377,14 +377,6 @@ fi
LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}"
-if test -z "$vpaths" ; then
- while read dep ; do
- base=$(basename $dep) ;
- vpaths="$vpaths /usr/lib/$base"
- addlibspath="$addlibspath -L/usr/lib/$base"
- done < package/deps-build
-fi
-
if $allstatic ; then
LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}"
tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d07ba86..aeaf0ba 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -25,6 +25,7 @@
dependency bumped to 2.14.3.0. </li>
<li> <a href="//skarnet.org/software/nsss/">nsss</a>
optional dependency bumped to 0.2.0.5. </li>
+ <li> Static libraries install in <tt>/usr/lib</tt> by default. </li>
</ul>
<h2> in 2.9.6.0 </h2>