From b168e1750972e65dd7542d495a490d0f44e5dabc Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 21:17:29 +0000 Subject: Install static libs in /usr/lib by default Signed-off-by: Laurent Bercot --- COPYING | 2 +- INSTALL | 10 +++++----- configure | 18 +++++------------- doc/index.html | 10 +++++----- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/COPYING b/COPYING index 6dafb4f..ce2bdb1 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2018-2022 Laurent Bercot +Copyright (c) 2018-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 a8b4882..d9a21fc 100644 --- a/INSTALL +++ b/INSTALL @@ -6,11 +6,11 @@ Build Instructions - A POSIX compatible system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.14.0.0 or later: https://skarnet.org/software/skalibs/ - - execline version 2.9.4.0 or later: https://skarnet.org/software/execline/ - - s6 version 2.11.4.0 or later: https://skarnet.org/software/s6/ - - s6-rc version 0.5.4.2 or later: https://skarnet.org/software/s6-rc/ - - s6-linux-init version 1.1.2.0 or later: https://skarnet.org/software/s6-linux-init/ + - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ + - 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/ + - s6-rc version 0.5.5.0 or later: https://skarnet.org/software/s6-rc/ + - s6-linux-init version 1.1.2.1 or later: https://skarnet.org/software/s6-linux-init/ * Standard usage diff --git a/configure b/configure index 2e5327a..3288470 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] @@ -142,7 +142,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 @@ -215,8 +215,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 @@ -373,14 +373,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 de1ec96..b307edd 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,15 +67,15 @@ they implement a powerful, fast, turnkey init system that is usable on
  • A Linux-based system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.14.0.0 or later
    • +2.14.3.0 or later
  • execline version -2.9.4.0 or later
    • +2.9.6.1 or later
  • s6 version -2.11.4.0 or later
    • +2.13.0.1 or later
  • s6-rc version -0.5.4.2 or later
    • +0.5.5.0 or later
  • s6-linux-init version -1.1.2.0 or later
    • +1.1.2.1 or later

    -- cgit v1.3.1