Install static libs in /usr/lib by default

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

4 files changed, 11 insertions, 26 deletions

diff --git a/COPYING b/COPYING
index 6dafb4f..ce2bdb1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2022 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2018-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 34c24bd..b359a67 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,13 +6,13 @@ 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/
+  - skalibs version 2.14.3.0 or later: http://skarnet.org/software/skalibs/
   - Linux-PAM version 1.3.0 or later: http://www.linux-pam.org/library/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
   http://pubs.opengroup.org/onlinepubs/9699919799/
-as well as Linux-PAM. As of November 2022, this means only Linux.
+as well as Linux-PAM. As of September 2024, this means only Linux.
 
 
 * Standard usage
@@ -21,15 +21,8 @@ as well as Linux-PAM. As of November 2022, this means only Linux.
   ./configure && make && sudo make install
 
  will work for most users.
- It will install the pamelad binary in /libexec,
-the static library in /usr/lib/pamela,
-and the shared library in /lib.
-
- Please note that static libraries in /usr/lib/pamela *will not*
-be found by a default linker invocation: you need -L/usr/lib/pamela.
-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 pamelad binary in /libexec, the static library
+in /usr/lib, and the shared library in /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 4d35b57..dd9c6fc 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 45692b2..9a2ca58 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -63,7 +63,7 @@ for privilege elevation.
 that supports Linux-PAM - (so, probably a Linux system) </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. It's a build-time requirement and a run-time
+2.14.3.0 or later. It's a build-time requirement and a run-time
 requirement. </li>
  <li> <a href="http://www.linux-pam.org/">Linux-PAM</a> version 1.3.0
 or later. It's a build-time requirement and a run-time requirement. </li>