Latest batch of fixes

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

4 files changed, 10 insertions, 5 deletions

diff --git a/doc/s6-linux-init-echo.html b/doc/s6-linux-init-echo.html
index 837eab0..5c9c685 100644
--- a/doc/s6-linux-init-echo.html
+++ b/doc/s6-linux-init-echo.html
@@ -47,7 +47,7 @@ character instead of a space. </li>
 no way to ensure that the <tt>echo</tt> program will behave consistently from
 Unix system to Unix system - and even from Linux distribution to Linux
 distribution. Despite there being a
-<a href="//pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html">standard</a>
+<a href="//pubs.opengroup.org/onlinepubs/9799919799/utilities/echo.html">standard</a>
 for it, the <tt>echo</tt> commands in GNU coreutils, busybox, toybox, sbase, and
 other implementations basically all exhibit different behaviours. Every shell has
 a built-in <tt>echo</tt> command, that fails to follow the POSIX standard. <tt>echo</tt>
diff --git a/doc/s6-linux-init-hpr.html b/doc/s6-linux-init-hpr.html
index f0ed6fe..400c9af 100644
--- a/doc/s6-linux-init-hpr.html
+++ b/doc/s6-linux-init-hpr.html
@@ -56,7 +56,7 @@ machine. </li>
  <li> <tt>-p</tt>&nbsp;: poweroff. The system will be shut down and the power turned off. </li>
  <li> <tt>-r</tt>&nbsp;: reboot. The system will reboot. </li>
  <li> <tt>-n</tt>&nbsp;: Do not call
-<a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/sync.html">sync()</a>
+<a href="https://pubs.opengroup.org/onlinepubs/9799919799/functions/sync.html">sync()</a>
 before the hardware shutdown. The default is to sync, just in case. This option is only
 relevant when combined with <tt>-f</tt>; without it, it has no effect. </li>
  <li> <tt>-d</tt>&nbsp;: Do not write a wtmp shutdown entry. </li>
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}/}"