From 3b89b580a0dc3a66b5b4b85a39a2f1cea7c5e677 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 28 Apr 2025 08:44:04 +0000
Subject:  Latest batch of fixes

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL                  | 4 ++--
 doc/index.html           | 2 +-
 doc/s6-basename.html     | 4 ++--
 doc/s6-cat.html          | 2 +-
 doc/s6-chmod.html        | 2 +-
 doc/s6-chown.html        | 2 +-
 doc/s6-cut.html          | 4 ++--
 doc/s6-dirname.html      | 4 ++--
 doc/s6-echo.html         | 2 +-
 doc/s6-env.html          | 4 ++--
 doc/s6-expr.html         | 4 ++--
 doc/s6-false.html        | 2 +-
 doc/s6-grep.html         | 6 +++---
 doc/s6-head.html         | 4 ++--
 doc/s6-hiercopy.html     | 2 +-
 doc/s6-ln.html           | 4 ++--
 doc/s6-ls.html           | 2 +-
 doc/s6-mkdir.html        | 4 ++--
 doc/s6-mkfifo.html       | 4 ++--
 doc/s6-nice.html         | 4 ++--
 doc/s6-sleep.html        | 4 ++--
 doc/s6-sort.html         | 2 +-
 doc/s6-tail.html         | 4 ++--
 doc/s6-touch.html        | 2 +-
 doc/s6-true.html         | 2 +-
 tools/configure.template | 9 +++++++--
 tools/gen-dotpc.sh       | 2 +-
 27 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/INSTALL b/INSTALL
index 32fe827..a200c8f 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/index.html b/doc/index.html
index bdc3411..32f819b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -36,7 +36,7 @@ instance, the (otherwise good)
 <p>
  Some of s6-portable-utils' programs are a conformant implementation
 of a POSIX utility as determined by the
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/nfindex.html">Single
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/nfindex.html">Single
 Unix Specification, version 4</a>; the relevant documentation pages mentions
 this.
 However, none of the s6-portable-utils programs supports internationalization.
diff --git a/doc/s6-basename.html b/doc/s6-basename.html
index 30c43b7..31546f6 100644
--- a/doc/s6-basename.html
+++ b/doc/s6-basename.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-basename acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/basename.html">basename</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/basename.html">basename</a> utility.
 </p>
 
 <h2> Extra options </h2>
@@ -43,7 +43,7 @@
 
 <p>
  s6-basename <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/basename.html">basename</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/basename.html">basename</a>
 program.
 </p>
 
diff --git a/doc/s6-cat.html b/doc/s6-cat.html
index 3f41b6e..900c0f9 100644
--- a/doc/s6-cat.html
+++ b/doc/s6-cat.html
@@ -44,7 +44,7 @@ s6-cat performs zero-copy transfer.
 
 <p>
  s6-cat <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/cat.html">cat</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/cat.html">cat</a>
 program.
 </p>
 
diff --git a/doc/s6-chmod.html b/doc/s6-chmod.html
index c987e81..0158184 100644
--- a/doc/s6-chmod.html
+++ b/doc/s6-chmod.html
@@ -38,7 +38,7 @@ must be an absolute octal number such as 0755 for
 
 <p>
  s6-chmod <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html">chmod</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/chmod.html">chmod</a>
 program.
 </p>
 
diff --git a/doc/s6-chown.html b/doc/s6-chown.html
index 5de306b..a2da9f2 100644
--- a/doc/s6-chown.html
+++ b/doc/s6-chown.html
@@ -45,7 +45,7 @@ gid to <em>account</em>'s. </li>
 
 <p>
  s6-chown <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/chown.html">chown</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/chown.html">chown</a>
 program.
 </p>
 
diff --git a/doc/s6-cut.html b/doc/s6-cut.html
index f9728a0..0fa6eef 100644
--- a/doc/s6-cut.html
+++ b/doc/s6-cut.html
@@ -30,14 +30,14 @@
 
 <p>
  s6-cut acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/cut.html">cut</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/cut.html">cut</a> utility.
 </p>
 
 <h2> Posixness </h2>
 
 <p>
  s6-cut <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/cut.html">cut</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/cut.html">cut</a>
 program.
 </p>
 
diff --git a/doc/s6-dirname.html b/doc/s6-dirname.html
index e8f54ef..0367449 100644
--- a/doc/s6-dirname.html
+++ b/doc/s6-dirname.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-dirname acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/dirname.html">dirname</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/dirname.html">dirname</a> utility.
 </p>
 
 <h2> Extra options </h2>
@@ -43,7 +43,7 @@
 
 <p>
  s6-dirname <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/dirname.html">dirname</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/dirname.html">dirname</a>
 program.
 </p>
 
diff --git a/doc/s6-echo.html b/doc/s6-echo.html
index 7a2fa98..150c3ee 100644
--- a/doc/s6-echo.html
+++ b/doc/s6-echo.html
@@ -44,7 +44,7 @@ character instead of a space. </li>
 
 <p>
  s6-echo <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html">echo</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/echo.html">echo</a>
 program.
 </p>
 
diff --git a/doc/s6-env.html b/doc/s6-env.html
index 4b1b75f..247f066 100644
--- a/doc/s6-env.html
+++ b/doc/s6-env.html
@@ -31,14 +31,14 @@ before running a program.
 
 <p>
  s6-env acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/env.html">env</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/env.html">env</a> utility.
 </p>
 
 <h2> Posixness </h2>
 
 <p>
  s6-env <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/env.html">env</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/env.html">env</a>
 program.
 </p>
 
diff --git a/doc/s6-expr.html b/doc/s6-expr.html
index 659e6f0..fd7569b 100644
--- a/doc/s6-expr.html
+++ b/doc/s6-expr.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-expr acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/expr.html">expr</a> utility,
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/expr.html">expr</a> utility,
 except that the <strong>:</strong> operator (pattern matching) is not supported.
 </p>
 
@@ -42,7 +42,7 @@ except that the <strong>:</strong> operator (pattern matching) is not supported.
 
 <p>
  s6-expr <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/expr.html">expr</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/expr.html">expr</a>
 program; however, if you are never using the pattern matching functionality, s6-expr
 scrupulously follows the rest of the specification.
 </p>
diff --git a/doc/s6-false.html b/doc/s6-false.html
index 415e9ce..1aed172 100644
--- a/doc/s6-false.html
+++ b/doc/s6-false.html
@@ -32,7 +32,7 @@
 
 <p>
  s6-false <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/false.html">false</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/false.html">false</a>
 program.
 </p>
 
diff --git a/doc/s6-grep.html b/doc/s6-grep.html
index 9e47c03..42ff11a 100644
--- a/doc/s6-grep.html
+++ b/doc/s6-grep.html
@@ -30,7 +30,7 @@
 
 <ul>
  <li> s6-grep compiles <em>pattern</em> as a
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03">Basic
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap09.html#tag_09_03">Basic
 Regular Expression</a> </li>
  <li> It reads stdin and matches every line against this regexp </li>
  <li> If the line matches, it prints it to stdout </li>
@@ -44,7 +44,7 @@ otherwise. </li>
  <li> <tt>-F</tt>&nbsp;: <em>pattern</em> is not compiled as a BRE, but is
 interpreted as a literal string. </li>
  <li> <tt>-E</tt>&nbsp;: <em>pattern</em> is not compiled as a BRE, but as an
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04">Extended
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap09.html#tag_09_04">Extended
 Regular Expression</a> (ERE). </li>
  <li> <tt>-i</tt>&nbsp;: ignore case during the match </li>
  <li> <tt>-c</tt>&nbsp;: do not write normal output; only write the number of
@@ -60,7 +60,7 @@ match <em>pattern</em>). </li>
 
 <p>
  s6-grep <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html">grep</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/grep.html">grep</a>
 program.
 </p>
 
diff --git a/doc/s6-head.html b/doc/s6-head.html
index 18fadfc..b73c984 100644
--- a/doc/s6-head.html
+++ b/doc/s6-head.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-head acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/head.html">head</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/head.html">head</a> utility.
 </p>
 
 <h2> Extra options </h2>
@@ -48,7 +48,7 @@ of <em>lines</em> lines. </li>
 
 <p>
  s6-head <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/head.html">head</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/head.html">head</a>
 program.
 </p>
 
diff --git a/doc/s6-hiercopy.html b/doc/s6-hiercopy.html
index 846e0c9..e66b01e 100644
--- a/doc/s6-hiercopy.html
+++ b/doc/s6-hiercopy.html
@@ -56,7 +56,7 @@ But then, <tt>cp</tt> shouldn't either. </li>
  <li> There is no standard way of creating device nodes on a
 filesystem, so any <tt>cp</tt>-like utility is inherently
 non-portable. Fortunately, most systems still agree on the non-portable usages of the
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/mknod.html">mknod
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/functions/mknod.html">mknod
 specification</a>, so things should work in practice. Consequently,
 the s6-hiercopy utility has been moved from
 <a href="//skarnet.org/software/s6-linux-utils/">s6-linux-utils</a>
diff --git a/doc/s6-ln.html b/doc/s6-ln.html
index 59dbdca..2736dc6 100644
--- a/doc/s6-ln.html
+++ b/doc/s6-ln.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-ln acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ln.html">ln</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/ln.html">ln</a> utility.
 </p>
 
 <h2> Options </h2>
@@ -48,7 +48,7 @@ it instead of adding a link in the directory </li>
 
 <p>
  s6-ln <strong>would be</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ln.html">ln</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/ln.html">ln</a>
 program, except that POSIX mandates that a preexisting <em>target</em> must first
 be <tt>unlink()</tt>ed and then (<tt>sym</tt>)<tt>link()</tt>ed, which prevents
 atomic replacements.
diff --git a/doc/s6-ls.html b/doc/s6-ls.html
index 2732fde..2a79559 100644
--- a/doc/s6-ls.html
+++ b/doc/s6-ls.html
@@ -50,7 +50,7 @@ not list <tt>.</tt> or <tt>..</tt> though. </li>
 
 <p>
  s6-ls <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html">ls</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/ls.html">ls</a>
 program.
 </p>
 
diff --git a/doc/s6-mkdir.html b/doc/s6-mkdir.html
index 9866720..1a04501 100644
--- a/doc/s6-mkdir.html
+++ b/doc/s6-mkdir.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-mkdir acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/mkdir.html">mkdir</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/mkdir.html">mkdir</a> utility.
 </p>
 
 <h2> Extra options </h2>
@@ -43,7 +43,7 @@
 
 <p>
  s6-mkdir <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/mkdir.html">mkdir</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/mkdir.html">mkdir</a>
 program.
 </p>
 
diff --git a/doc/s6-mkfifo.html b/doc/s6-mkfifo.html
index 801c3c4..ebf52ba 100644
--- a/doc/s6-mkfifo.html
+++ b/doc/s6-mkfifo.html
@@ -30,14 +30,14 @@
 
 <p>
  s6-mkfifo acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/mkfifo.html">mkfifo</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/mkfifo.html">mkfifo</a> utility.
 </p>
 
 <h2> Posixness </h2>
 
 <p>
  s6-mkfifo <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/mkfifo.html">mkfifo</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/mkfifo.html">mkfifo</a>
 program.
 </p>
 
diff --git a/doc/s6-nice.html b/doc/s6-nice.html
index 037088f..349a773 100644
--- a/doc/s6-nice.html
+++ b/doc/s6-nice.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-nice acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/nice.html">nice</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/nice.html">nice</a> utility.
 </p>
 
 <h2> Extra options </h2>
@@ -46,7 +46,7 @@ exit 111 with an error message.
 
 <p>
  s6-nice <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/nice.html">nice</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/nice.html">nice</a>
 program.
 </p>
 
diff --git a/doc/s6-sleep.html b/doc/s6-sleep.html
index 863e53c..18e1c11 100644
--- a/doc/s6-sleep.html
+++ b/doc/s6-sleep.html
@@ -30,7 +30,7 @@
 
 <ul>
  <li> s6-sleep acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sleep.html">sleep</a> utility.
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/sleep.html">sleep</a> utility.
 It ignores non-lethal signals. </li>
  <li> If there are <em>prog...</em> arguments, then s6-sleep executes
 into <em>prog...</em> after sleeping. Else, it exits 0. </li>
@@ -46,7 +46,7 @@ into <em>prog...</em> after sleeping. Else, it exits 0. </li>
 
 <p>
  s6-sleep <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sleep.html">sleep</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/sleep.html">sleep</a>
 program.
 </p>
 
diff --git a/doc/s6-sort.html b/doc/s6-sort.html
index ac069b0..e239d41 100644
--- a/doc/s6-sort.html
+++ b/doc/s6-sort.html
@@ -52,7 +52,7 @@ instead of newlines </li>
 
 <p>
  s6-sort <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sort.html">sort</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/sort.html">sort</a>
 program.
 </p>
 
diff --git a/doc/s6-tail.html b/doc/s6-tail.html
index f905d4b..867a12b 100644
--- a/doc/s6-tail.html
+++ b/doc/s6-tail.html
@@ -30,7 +30,7 @@
 
 <p>
  s6-tail acts as the generic
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/tail.html">tail</a> utility,
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/tail.html">tail</a> utility,
 except that the <strong>-f</strong> option is not supported.
 </p>
 
@@ -38,7 +38,7 @@ except that the <strong>-f</strong> option is not supported.
 
 <p>
  s6-tail <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/tail.html">tail</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/tail.html">tail</a>
 program; however, if you are never using the <tt>-f</tt> functionality, s6-tail
 scrupulously follows the rest of the specification.
 </p>
diff --git a/doc/s6-touch.html b/doc/s6-touch.html
index 2f00059..c44345d 100644
--- a/doc/s6-touch.html
+++ b/doc/s6-touch.html
@@ -38,7 +38,7 @@ then closing them.
 
 <p>
  s6-touch <strong>is not</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/touch.html">touch</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/touch.html">touch</a>
 program.
 </p>
 
diff --git a/doc/s6-true.html b/doc/s6-true.html
index 635c36b..70ac882 100644
--- a/doc/s6-true.html
+++ b/doc/s6-true.html
@@ -32,7 +32,7 @@
 
 <p>
  s6-true <strong>is</strong> suitable as a Single Unix
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/false.html">true</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/utilities/false.html">true</a>
 program.
 </p>
 
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}/}"
-- 
cgit v1.3.1