From edf8a8d3e6e27a6a792b78a1ff4c458609b529ff Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 23 Sep 2024 16:38:26 +0000
Subject:  Install static libs in /usr/lib by default

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 configure | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 6b1354e..6bc9fd5 100755
--- a/configure
+++ b/configure
@@ -141,7 +141,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
@@ -207,8 +207,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
@@ -365,14 +365,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
-- 
cgit v1.3.1