Install static libraries in /usr/lib by default

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

4 files changed, 12 insertions, 24 deletions

diff --git a/INSTALL b/INSTALL
index ec6a1aa..ea4b004 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,13 +20,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-dns.
-
- Please note that static libraries in /usr/lib/s6-dns *will not*
-be found by a default linker invocation: you need -L/usr/lib/s6-dns.
-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 0a48a27..4383cde 100644
--- a/NEWS
+++ b/NEWS
@@ -3,9 +3,10 @@ Changelog for s6-dns.
 In 2.3.8.0
 ----------
 
- - Depend on skalibs-2.14.3.0, remove s6dns_mininetstring_read
- - Better debug packet dump in s6-dnsq[r]
- - New s6dns_engine_query() to get the query encoded in a dt
+ - Depend on skalibs-2.14.3.0, remove s6dns_mininetstring_read.
+ - Better debug packet dump in s6-dnsq[r].
+ - New s6dns_engine_query() to get the query encoded in a dt.
+ - Install static libraries in /usr/lib by default.
 
 
 In 2.3.7.2
diff --git a/configure b/configure
index 18db5bc..399cf4d 100755
--- a/configure
+++ b/configure
@@ -21,11 +21,11 @@ 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]
 
  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]
@@ -138,7 +138,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'
 sysdeps='$prefix/lib/skalibs/sysdeps'
 manualsysdeps=false
@@ -199,8 +199,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
@@ -357,14 +357,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 960129f..6526a7f 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -23,7 +23,8 @@
 <ul>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
 dependency bumped to 2.14.3.0. </li>
- <li> New function: <tt>s6dns_engine_query()</tt>
+ <li> New function: <tt>s6dns_engine_query()</tt>. </li>
+ <li> Static libraries are installed in <tt>/usr/lib</tt>. </li>
 </ul>
 
 <h2> in 2.3.7.2 </h2>