From 546b31b5572decf578beecff7829e78603d612d4 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 18:37:31 +0000 Subject: Align configure to /usr/lib default Signed-off-by: Laurent Bercot --- COPYING | 2 +- INSTALL | 2 +- NEWS | 1 + configure | 18 +++++------------- doc/index.html | 2 +- doc/upgrade.html | 4 ++++ 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/COPYING b/COPYING index c0a0ab4..2475f17 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2015-2023 Laurent Bercot +Copyright (c) 2015-2024 Laurent Bercot Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/INSTALL b/INSTALL index 4ae17a9..0795ead 100644 --- a/INSTALL +++ b/INSTALL @@ -8,7 +8,7 @@ Build Instructions - GNU make version 3.81 or later - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ - Optional: nsss version 0.2.0.5 or later: https://skarnet.org/software/nsss/ - - Optional: utmps version 0.1.2.2 or later: https://skarnet.org/software/utmps/ + - Optional: utmps version 0.1.2.3 or later: https://skarnet.org/software/utmps/ - execline version 2.9.6.1 or later: https://skarnet.org/software/execline/ - s6 version 2.13.0.1 or later: https://skarnet.org/software/s6/ diff --git a/NEWS b/NEWS index 6e71a80..8eb94b4 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ In 1.1.2.1 ---------- - Bugfixes. + - Install static libraries in /usr/lib. In 1.1.2.0 diff --git a/configure b/configure index c33f1c8..3e92ee6 100755 --- a/configure +++ b/configure @@ -21,14 +21,14 @@ 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] --skeldir=DIR script skeleton files [PREFIX/etc/s6-linux-init/skel] --tmpfsdir=DIR assume the initial tmpfs will be mounted on DIR [/run] --scandir=DIR use tmpfsdir/DIR as the s6-svscan directory [service] 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] @@ -155,7 +155,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 @@ -228,8 +228,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 @@ -388,14 +388,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/index.html b/doc/index.html index 5723431..d761874 100644 --- a/doc/index.html +++ b/doc/index.html @@ -96,7 +96,7 @@ want nsswitch-like functionality: 0.2.0.5 or later (build-time and boot-time)
  • If you want secure utmp functionality: utmps version -0.1.2.2 or later (build-time and boot-time)
    • +0.1.2.3 or later (build-time and boot-time)

    Licensing

    diff --git a/doc/upgrade.html b/doc/upgrade.html index b997984..632daed 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -25,10 +25,14 @@ dependency bumped to 2.14.3.0.
  • nsss optional dependency bumped to 0.2.0.5.
    • +
  • utmps +optional dependency bumped to 0.1.2.3.
  • execline dependency bumped to 2.9.6.1.
  • s6 dependency bumped to 2.13.0.1.
    • +
  • Static libraries (if any) are installed in /usr/lib +by default.

    • in 1.1.2.0

    -- cgit v1.2.3