From 8de20625f671a4c45abfc46821651476cf6d5fe6 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 18:56:24 +0000 Subject: Prepare for 2.6.2.1; align configure to rest of skaware Signed-off-by: Laurent Bercot --- COPYING | 2 +- INSTALL | 2 +- NEWS | 6 ++++++ configure | 18 +++++------------- doc/index.html | 4 ++-- doc/upgrade.html | 9 +++++++++ package/info | 2 +- 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/COPYING b/COPYING index 08c9298..2ea7ac0 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2023 Laurent Bercot +Copyright (c) 2011-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 5ff87c0..af15ccd 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - 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: https://skarnet.org/software/skalibs/ + - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ This software is Linux-specific. It will run on a Linux kernel, version 3.5 or later. diff --git a/NEWS b/NEWS index 2ec2bf4..c4120e0 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for s6-linux-utils. +In 2.6.2.1 +---------- + + - Align configure script to the rest of skaware. + + In 2.6.2.0 ---------- diff --git a/configure b/configure index 924d07e..8412e0f 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] @@ -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 @@ -210,8 +210,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 @@ -368,14 +368,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 cd33f41..4233359 100644 --- a/doc/index.html +++ b/doc/index.html @@ -47,7 +47,7 @@ on the wrong page. I apologize for the confusion. The Linux kernel must be 3.5 or later.
  • GNU make, version 3.81 or later
  • skalibs version -2.14.0.0 or later. It's a build-time requirement. It's also a run-time +2.14.3.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
    • @@ -63,7 +63,7 @@ library.
    • The current released version of s6-linux-utils is -2.6.2.0.
      • +2.6.2.1.
    • Alternatively, you can checkout a copy of the s6-linux-utils git repository: diff --git a/doc/upgrade.html b/doc/upgrade.html index 7c6c002..069f0ea 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,15 @@

      What has changed in s6-linux-utils

      +

      in 2.6.2.1

      + +
        +
      • skalibs +dependency bumped to 2.14.3.0.
        • +
      • Static libraries (if any, which isn't the case for now) +are installed in /usr/lib by default.
        • +
      +

      in 2.6.2.0

        diff --git a/package/info b/package/info index cb03f7a..db7d99a 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-linux-utils -version=2.6.2.0 +version=2.6.2.1 category=admin package_macro_name=S6_LINUX_UTILS -- cgit v1.2.3