Update deps, install static libs in /usr/lib by default

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

4 files changed, 13 insertions, 28 deletions

diff --git a/COPYING b/COPYING
index 2862673..8c60f75 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2022 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2017-2024 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index 41ecbde..8e7379b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.14.0.0 or later: http://skarnet.org/software/skalibs/
-  - execline version 2.9.4.0 or later: http://skarnet.org/software/execline/
-  - s6 version 2.11.4.0 or later: http://skarnet.org/software/s6/
+  - skalibs version 2.14.3.0 or later: http://skarnet.org/software/skalibs/
+  - execline version 2.9.6.1 or later: http://skarnet.org/software/execline/
+  - s6 version 2.13.0.1 or later: http://skarnet.org/software/s6/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
@@ -21,14 +21,7 @@ POSIX.1-2008, available at:
   ./configure && make && sudo make install
 
  will work for most users.
- It will install the binaries in /bin and the static libraries in
-/usr/lib/skabus.
-
- Please note that static libraries in /usr/lib/skabus *will not*
-be found by a default linker invocation: you need -L/usr/lib/skabus.
-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.
+ It will install the binaries in /bin and the static libraries in /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/configure b/configure
index 627b102..72d40c6 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/index.html b/doc/index.html
index 3b8597c..0ae5ee9 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -50,11 +50,11 @@ a consistent vision behind them.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.14.0.0 or later </li>
+2.14.3.0 or later </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.4.0 or later </li>
+2.9.6.1 or later </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.11.4.0 or later </li>
+2.13.0.1 or later </li>
 
 </ul>