summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2024-09-23 18:47:27 +0000
committerLaurent Bercot <ska@appnovation.com>2024-09-23 18:47:27 +0000
commit133a98cfccabd660afe2d59c142e0f83ebd88b28 (patch)
treede74df384749b2a253731623d5c9f0d4b9ba8515 /configure
parent00ad09ecf7ad44e32c3cc54819bbf50e944fd4f9 (diff)
downloads6-portable-utils-133a98cfccabd660afe2d59c142e0f83ebd88b28.tar.xz
Prepare for 2.3.0.4; align configure to rest of skaware
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 5a0e56d..92499cc 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]
@@ -139,7 +139,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
@@ -203,8 +203,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
@@ -361,14 +361,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