Latest batch of fixes

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

6 files changed, 14 insertions, 9 deletions

diff --git a/INSTALL b/INSTALL
index bf8cfee..103217e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,8 +17,8 @@ Build Instructions
         libretls version 3.8.1 or later: https://git.causal.agency/libretls/about/
 
  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/s6-getservbyname.html b/doc/s6-getservbyname.html
index 7f4d9c4..8644c2a 100644
--- a/doc/s6-getservbyname.html
+++ b/doc/s6-getservbyname.html
@@ -20,7 +20,7 @@
 
 <p>
 <tt>s6-getservbyname</tt> is a simple command-line interface to the
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/getservbyname.html">getservbyname()</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/functions/getservbyname.html">getservbyname()</a>
 function, converting a service name and protocol into a port number.
 </p>
 
diff --git a/doc/s6-sntpclock.html b/doc/s6-sntpclock.html
index 3403226..40e98a2 100644
--- a/doc/s6-sntpclock.html
+++ b/doc/s6-sntpclock.html
@@ -86,7 +86,7 @@ server is more than 34 years away from the time given by the system clock,
 then NTP just cannot compute. This is a problem for CMOS-less systems,
 where the system clock is initialized to the Unix Epoch. The solution
 is to first manually initialize the system clock with a program such as
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/date.html">date</a> or
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/date.html">date</a> or
 <a href="//skarnet.org/software/s6-portable-utils/s6-clock.html">s6-clock</a>
 to a closer time (such as 2013-01-01, which will be good up to 2047), then
 contact the NTP server. </li>
diff --git a/doc/s6-tcpserver-socketbinder.html b/doc/s6-tcpserver-socketbinder.html
index 8e7135d..c31c821 100644
--- a/doc/s6-tcpserver-socketbinder.html
+++ b/doc/s6-tcpserver-socketbinder.html
@@ -33,7 +33,7 @@ socket to an IPv4 or IPv6 address and port, then executes a program.
  <li> s6-tcpserver-socketbinder creates a TCP socket
 and binds it to IP address <em>ip</em>, port <em>port</em>.
 It prepares the socket to accept connections by calling
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html">listen()</a>. </li>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/functions/listen.html">listen()</a>. </li>
  <li> It then execs into <em>prog...</em> with the open socket
 as its standard input. </li>
 </ul>
@@ -43,7 +43,7 @@ as its standard input. </li>
 <ul>
  <li> <tt>-d</tt>&nbsp;: allow instant rebinding to the same IP and port
 even if it has been used not long ago - this is the SO_REUSEADDR flag to
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/setsockopt.html">setsockopt()</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/functions/setsockopt.html">setsockopt()</a>
 and is generally used with server programs. This is the default. </li>
  <li> <tt>-D</tt>&nbsp;: disallow instant rebinding to the same path. </li>
  <li> <tt>-b&nbsp;<em>backlog</em></tt>&nbsp;: set a maximum of
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}/}"