Latest batch of fixes

Signed-off-by: Laurent Bercot <ska@appnovation.com>

5 files changed, 12 insertions, 7 deletions

diff --git a/INSTALL b/INSTALL
index 555c2cc..2895645 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,8 +9,8 @@ Build Instructions
   - skalibs version 2.14.4.0 or later: https://skarnet.org/software/skalibs/
 
  This software will run on any operating system that implements
-POSIX.1-2008, available at:
-  https://pubs.opengroup.org/onlinepubs/9699919799/
+POSIX.1-2024, available at:
+  https://pubs.opengroup.org/onlinepubs/9799919799/
 
 
 * Standard usage
diff --git a/doc/getaddrinfo.html b/doc/getaddrinfo.html
index a6ea981..97b7482 100644
--- a/doc/getaddrinfo.html
+++ b/doc/getaddrinfo.html
@@ -21,7 +21,7 @@
 <p>
  The standard C library provides an API to perform name
 resolution:
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html">getaddrinfo()</a>,
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/functions/getaddrinfo.html">getaddrinfo()</a>,
 formerly <tt>gethostbyname()</tt>. However, for DNS resolution as well as
 implementation in the libc, this interface is very impractical, to the point of
 being unusable. Here are a few reasons why.
diff --git a/doc/libs6dns/s6dns-resolve.html b/doc/libs6dns/s6dns-resolve.html
index 8dc6bef..55f961c 100644
--- a/doc/libs6dns/s6dns-resolve.html
+++ b/doc/libs6dns/s6dns-resolve.html
@@ -92,7 +92,7 @@ The other prototypes can be found in the <tt>s6-dns/s6dns-resolve.h</tt> file.
 <p>
  Some <tt>errno</tt> codes reported by these functions do not have
 exactly the system meaning given by
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/strerror.html">strerror()</a>.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/functions/strerror.html">strerror()</a>.
 To get a user-friendly error message, use
 <tt>s6dns_constants_error_str(errno)</tt> instead. The <tt>s6dns_constants_error_str</tt>
 function is declared in the <tt>s6dns-constants.h</tt> header.
diff --git a/tools/configure.template b/tools/configure.template
index f9faa60..54e5ea1 100755
--- a/tools/configure.template
+++ b/tools/configure.template
@@ -23,6 +23,7 @@ Fine tuning of the installation directories:
   --libexecdir=DIR              package-scoped executables [EPREFIX/libexec]
   --libdir=DIR                  static library files [PREFIX/lib]
   --includedir=DIR              C header files [PREFIX/include]
+  --sysconfdir=DIR              global configuration files [PREFIX/etc]
   --pkgconfdir=DIR              pkg-config .pc files [PREFIX/lib/pkgconfig]
 ${configure_help_install}
  If no --prefix option is given, by default libdir (but not dynlibdir) will be
@@ -141,6 +142,7 @@ libexecdir='$exec_prefix/libexec'
 bindir='$exec_prefix/bin'
 libdir='$prefix/lib'
 includedir='$prefix/include'
+sysconfdir='$prefix/etc'
 pkgconfdir='$prefix/lib/pkgconfig'
 shebangdir='$bindir'
 sysdeps='$prefix/lib/skalibs/sysdeps'
@@ -177,10 +179,11 @@ for arg ; do
     --bindir=*) bindir=${arg#*=} ;;
     --libdir=*) libdir=${arg#*=} ;;
     --includedir=*) includedir=${arg#*=} ;;
+    --sysconfdir=*) sysconfdir=${arg#*=} ;;
     --pkgconfigdir=*) pkgconfigdir=${arg#*=} ;;
     --with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;;
     --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ; depincpath="${depincpath}${depincpath:+ }-I$var" ;;
-    --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; deplibpath="${deplibpath}${deplibpath:+ }-I$var" ; vpaths="$vpaths $var" ;;
+    --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; deplibpath="${deplibpath}${deplibpath:+ }-L$var" ; vpaths="$vpaths $var" ;;
     --with-dynlib=*) var=${arg#*=} ; stripdir var ; addlibdpath="$addlibdpath -L$var" ; vpathd="$vpathd $var" ;;
     --with-pkgconfig=*) pkgconf=${arg#*=} ;;
     --with-pkgconfig) pkgconf=${PKG_CONFIG:-pkg-config} ;;
@@ -231,7 +234,7 @@ fi
 
 # Expand installation directories
 stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir libdir includedir pkgconfdir sysdeps sproot ${configure_expand_dirs} ; do
+for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot ${configure_expand_dirs} ; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -438,6 +441,7 @@ libexecdir := $libexecdir
 bindir := $bindir
 libdir := $libdir
 includedir := $includedir
+sysconfdir := $sysconfdir
 pkgconfdir := $pkgconfdir
 sysdeps := $sysdeps
 slashpackage := $slashpackage
@@ -526,6 +530,7 @@ else
   echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$libexecdir/\""
 fi
 echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\""
+echo "#define ${package_macro_name}_SYSCONFPREFIX \"$sysconfdir/\""
 ${configure_generate_configh}
 echo
 echo "#endif"
diff --git a/tools/gen-dotpc.sh b/tools/gen-dotpc.sh
index 63c8929..802c78e 100755
--- a/tools/gen-dotpc.sh
+++ b/tools/gen-dotpc.sh
@@ -85,7 +85,7 @@ echo "includedir=${includedir}"
 echo "libdir=${libdir}"
 echo "dynlibdir=${dynlibdir}"
 echo
-echo "Name: ${library}"
+echo "Name: lib${library}"
 echo "Version: ${version}"
 echo "Description: ${description:-The ${library} library.}"
 echo "URL: ${url:-https://skarnet.org/software/${package}/}"