summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2024-09-23 19:57:28 +0000
committerLaurent Bercot <ska@appnovation.com>2024-09-23 19:57:28 +0000
commite9b3fdb19cb1bcabbd1926ebe05f111cac30e233 (patch)
tree14988a6592f8d91b199ee7652d60f86c3cdaec5f /configure
parentc5df78c777a00e464101da680cdba0cca518225e (diff)
downloads6-networking-e9b3fdb19cb1bcabbd1926ebe05f111cac30e233.tar.xz
Install static libraries in /usr/lib by default
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 5 insertions, 13 deletions
diff --git a/configure b/configure
index 4823155..652e52f 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]
@@ -144,7 +144,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
@@ -216,8 +216,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
@@ -375,14 +375,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