Install static libraries in /usr/lib by default

Signed-off-by: Laurent Bercot <ska@appnovation.com>

5 files changed, 12 insertions, 22 deletions

diff --git a/INSTALL b/INSTALL
index 09adcdc..c7d5743 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ Build Instructions
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
   - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/
-  - execline version 2.9.6.0 or later: https://skarnet.org/software/execline/
+  - execline version 2.9.6.1 or later: https://skarnet.org/software/execline/
   - s6 version 2.13.0.1 or later: https://skarnet.org/software/s6/
 
  This software will run on any operating system that implements
@@ -22,13 +22,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/s6-rc.
-
- Please note that static libraries in /usr/lib/s6-rc *will not*
-be found by a default linker invocation: you need -L/usr/lib/s6-rc.
-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 1d72456..5e69369 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ In 0.5.5.0
 ----------
 
  - Bugfixes. These include a new API in libs6rc.
+ - Install static libraries in /usr/lib by default.
 
 
 In 0.5.4.3
diff --git a/configure b/configure
index 66d4aac..18f4108 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]
   --livedir=DIR                 default live directory [/run/s6-rc]
 
  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]
@@ -139,7 +139,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'
 livedir=/run/s6-rc
 sysdeps='$prefix/lib/skalibs/sysdeps'
@@ -202,8 +202,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
@@ -360,14 +360,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/index.html b/doc/index.html
index 687764d..206286e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -51,7 +51,7 @@ scripts are also run in a controlled environment.
 2.14.3.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs library. </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.6.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
+2.9.6.1 or later. It's a build-time <em>and</em> run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
 2.13.0.1 or later. It's a build-time <em>and</em> run-time requirement. </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 8ba3b49..b2e438c 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -35,8 +35,11 @@ minor and bugfix version changes.
 <ul>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
 dependency bumped to 2.14.3.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.9.6.1. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a>
 dependency bumped to 2.13.0.1. </li>
+ <li> Static libraries are installed in <tt>/usr/lib</tt> by default. </li>
 </ul>
 
 <h2> in 0.5.4.3 </h2>