diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2024-09-23 18:22:32 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2024-09-23 18:22:32 +0000 |
| commit | a4e8c4473a214b783d05a1fd98309596943847f5 (patch) | |
| tree | 78c30507d25518a62b391dae988783dd7781e18d /configure | |
| parent | d3a944d70ef6b07753659aabe237168f91473fc8 (diff) | |
| download | s6-rc-a4e8c4473a214b783d05a1fd98309596943847f5.tar.xz | |
Install static libraries in /usr/lib by default
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 5 insertions, 13 deletions
@@ -21,12 +21,12 @@ 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] --livedir=DIR default live directory [/run/s6-rc] 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' livedir=/run/s6-rc sysdeps='$prefix/lib/skalibs/sysdeps' @@ -202,8 +202,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 @@ -360,14 +360,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 |