diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2024-09-23 16:38:26 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2024-09-23 16:38:26 +0000 |
| commit | edf8a8d3e6e27a6a792b78a1ff4c458609b529ff (patch) | |
| tree | 201937176fe36c5f22fdd7dfce4508548b196aca | |
| parent | cb33f3c61e3e9e8b2204c2a1288d9168291fbabb (diff) | |
| download | nsss-edf8a8d3e6e27a6a792b78a1ff4c458609b529ff.tar.gz nsss-edf8a8d3e6e27a6a792b78a1ff4c458609b529ff.tar.xz nsss-edf8a8d3e6e27a6a792b78a1ff4c458609b529ff.zip | |
Install static libs in /usr/lib by default
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | INSTALL | 8 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | doc/upgrade.html | 1 |
4 files changed, 6 insertions, 18 deletions
diff --git a/INSTALL b/INSTALL index f0586f9..2c0147d 100644 --- a/INSTALL +++ b/INSTALL @@ -22,13 +22,7 @@ POSIX.1-2008, available at: will work for most users. It will install the binaries in /bin and the static libraries in -/usr/lib/nsss. - - Please note that static libraries in /usr/lib/nsss *will not* -be found by a default linker invocation: you need -L/usr/lib/nsss. -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. +/usr/lib. You can strip the binaries and libraries of their extra symbols via "make strip" before the "make install" phase. It will shave a few bytes diff --git a/NEWS b/NEWS index 6729928..7763793 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ In 0.2.0.5 ---------- - Bugfixes. + - Install static libs in /usr/lib by default. In 0.2.0.4 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 diff --git a/doc/upgrade.html b/doc/upgrade.html index 1c888c7..a00c0b5 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -25,6 +25,7 @@ dependency bumped to 2.14.3.0. </li> <li> <a href="//skarnet.org/software/s6/">s6</a> run-time dependency bumped to 2.13.0.1. </li> + <li> Static libraries now install in <tt>/usr/lib</tt> by default. </li> </ul> <h2> In 0.2.0.4 </h2> |