Describe a config.site that can be used for FHS compliance.

* doc/autoconf.texi (Site Defaults): Fix typo.  Add new example
for FHS.
* THANKS: Update.
Reported by Jules Colding and Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index b61b26c098131045b06d215e11b9754e4d0854c8..a003d47c68e84e552ceda968b69f8ef07f96548c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-08  Eric Blake  <ebb9@byu.net>
+
+       Describe a config.site that can be used for FHS compliance.
+       * doc/autoconf.texi (Site Defaults): Fix typo.  Add new example
+       for FHS.
+       * THANKS: Update.
+       Reported by Jules Colding and Ralf Wildenhues.
+
 2008-02-02  Eric Blake  <ebb9@byu.net>
 
        * doc/autoconf.texi (Limitations of Usual Tools) <grep>: Fix typo.

diff --git a/THANKS b/THANKS
index 6e5ca5b515f0a879007fe4cc87dd53c0ba2b59e4..8d83bbddb772d63d45f5fa4659aa7e769980bec8 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -165,6 +165,7 @@ John Interrante             interran@uluru.stanford.edu
 John W. Eaton               jwe@bevo.che.wisc.edu
 Jonathan Kamens             jik@kamens.brookline.ma.us
 Joseph S. Myers             jsm28@cam.ac.uk
+Jules Colding               colding@42tools.com
 Julian Onions               j.onions@nexor.co.uk
 Julien Danjou               acid@debian.org
 Julio Garvia                ?

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 395b2c1d4a2badbf38bcda08a3d1ca7f30e4a036..b0668a8a27ca6e5384c7b4f314d9f1af664b3cc5 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -17865,8 +17865,8 @@ file (if @code{CONFIG_SITE} is not set to a different file).
 # Change some defaults.
 test "$prefix" = NONE && prefix=/usr/share/local/gnu
 test "$exec_prefix" = NONE && exec_prefix=/usr/local/gnu
-test "$sharedstatedir" = '$prefix/com' && sharedstatedir=/var
-test "$localstatedir" = '$prefix/var' && localstatedir=/var
+test "$sharedstatedir" = '${prefix}/com' && sharedstatedir=/var
+test "$localstatedir" = '${prefix}/var' && localstatedir=/var
 
 # Give Autoconf 2.x generated configure scripts a shared default
 # cache file for feature test results, architecture-specific.
@@ -17877,6 +17877,26 @@ if test "$cache_file" = /dev/null; then
 fi
 @end example
 
+@cindex Filesystem Hierarchy Standard
+@cindex FHS
+
+Another use of @file{config.site} is for priming the directory variables
+in a manner consistent with the Filesystem Hierarchy Standard
+(@acronym{FHS}).  Once the following file is installed at
+@file{/usr/share/config.site}, a user can execute simply
+@command{./configure --prefix=/usr} to get all the directories chosen in
+the locations recommended by @acronym{FHS}.
+
+@example
+# /usr/local/config.site for FHS defaults when installing below /usr,
+# and the respective settings were not changed on the command line.
+if test "$prefix" = /usr; then
+  test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+  test "$sharedstatedir" = '${prefix}/com' && sharedstatedir=/var
+  test "$localstatedir" = '${prefix}/var' && localstatedir=/var
+fi
+@end example
+
 
 @c ============================================== Running configure Scripts.