From 5780806dc09aae630eff021c5971eda02c7b72ab Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 23 Sep 2024 14:55:27 +0000
Subject:  Install libskarnet.a to /usr/lib by default

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL          | 8 +-------
 NEWS             | 1 +
 configure        | 6 +++---
 doc/upgrade.html | 3 +++
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index 012f350..dabe92b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,15 +21,9 @@ POSIX.1-2008, available at:
   ./configure && make && sudo make install
 
  will work for most users.
- It will install the static libraries in /usr/lib/skalibs, the shared
+ It will install the static libraries in /usr/lib, the shared
 libraries in /lib, and the sysdeps in /usr/lib/skalibs/sysdeps.
 
- Please note that static libraries in /usr/lib/skalibs *will not*
-be found by a default linker invocation: you need -L/usr/lib/skalibs.
-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.
-
  You can strip the libraries of their extra symbols via "make strip"
 before the "make install" phase. It will shave a few bytes off them.
 
diff --git a/NEWS b/NEWS
index e0e040f..80d1a26 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ In 2.4.3.0
  - Newish function: mininetstring_read().
     (was previously removed in 2.7.0.0)
  - New header: cplz.h
+ - Install .a to /usr/lib by default
 
 
 In 2.4.2.0
diff --git a/configure b/configure
index 72d95ab..a0f5a1b 100755
--- a/configure
+++ b/configure
@@ -366,7 +366,7 @@ LDFLAGS_NOSHARED=
 LDFLAGS_SHARED=-shared
 prefix=
 dynlibdir='$prefix/lib'
-libdir='$prefix/lib/$package'
+libdir='$prefix/lib'
 includedir='$prefix/include'
 sysconfdir='$prefix/etc'
 sysdepdir='$prefix/lib/$package/sysdeps'
@@ -436,8 +436,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
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 2a93362..eb7a7aa 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -22,6 +22,9 @@
  <li> <tt>UNIXMESSAGE_MAXFDS</tt> decreased to 253. </li>
  <li> New <tt>mininetstring_read()</tt> function. (Was
 previously removed in 2.7.0.0.) </li>
+ <li> New <tt>cplz.h</tt> header. </li>
+ <li> Static libraries now install to <tt>/usr/lib</tt> by
+default. </li>
 </ul>
 
 <h2> in 2.14.2.0 </h2>
-- 
cgit v1.2.3