From: Eric Blake Date: Tue, 3 Feb 2009 16:01:52 +0000 (-0700) Subject: Document lib64 in config.site. X-Git-Tag: v2.63b~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20dd02aa3f0de034c2bef7f4e13944f211213a9e;p=thirdparty%2Fautoconf.git Document lib64 in config.site. * doc/autoconf.texi (Site Defaults): Fix typo in FHS sample file. Mention use of lib64. * THANKS: Update. Reported by Tom Browder, with help from Peter Breitenlohner. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index a706db25a..7ae64b948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-02-03 Eric Blake + + Document lib64 in config.site. + * doc/autoconf.texi (Site Defaults): Fix typo in FHS sample file. + Mention use of lib64. + * THANKS: Update. + Reported by Tom Browder, with help from Peter Breitenlohner. + 2009-01-28 Eric Blake Use AC_DEFUN_ONCE for uncontroversial one-shot macros. diff --git a/THANKS b/THANKS index 74895cf36..a4d9c2360 100644 --- a/THANKS +++ b/THANKS @@ -343,6 +343,7 @@ Thomas Winder tom@vlsivie.tuwien.ac.at Tim Mooney mooney@dogbert.cc.ndsu.NoDak.edu Tim Rice tim@multitalents.net Tim Van Holder tim.van.holder@pandora.be +Tom Browder tom.browder@gmail.com Tom Epperly tepperly@llnl.gov Tom Lane tgl@sss.pgh.pa.us Tom Purcell Tom.Purcell@wang.com diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 0d20f2a20..4e487df00 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -19737,12 +19737,12 @@ site files. Your code should check that variables such as @code{prefix} and @code{cache_file} have their default values (as set near the top of @command{configure}) before changing them. -Here is a sample file @file{/usr/share/local/gnu/share/config.site}. The +Here is a sample file @file{/usr/share/local/@/gnu/share/@/config.site}. The command @samp{configure --prefix=/usr/share/local/gnu} would read this file (if @code{CONFIG_SITE} is not set to a different file). @example -# config.site for configure +# /usr/share/local/gnu/share/config.site for configure # # Change some defaults. test "$prefix" = NONE && prefix=/usr/share/local/gnu @@ -19770,7 +19770,7 @@ in a manner consistent with the Filesystem Hierarchy Standard the locations recommended by @acronym{FHS}. @example -# /usr/local/config.site for FHS defaults when installing below /usr, +# /usr/share/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 @@ -19779,6 +19779,18 @@ if test "$prefix" = /usr; then fi @end example +@cindex lib64 +@cindex 64-bit libraries +Likewise, on platforms where 64-bit libraries are built by default, then +installed in @file{/usr/local/@/lib64} instead of @file{/usr/local/@/lib}, +it is appropriate to install @file{/usr/local/@/share/config.site}: + +@example +# /usr/local/share/config.site for platforms that prefer +# the directory /usr/local/lib64 over /usr/local/lib. +test "$libdir" = '$@{exec_prefix@}/lib' && libdir='$@{exec_prefix@}/lib64' +@end example + @c ============================================== Running configure Scripts.