* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Define datarootdir,

docdir, htmldir, dvidir, pdfdir, psdir, and localdir.  Update
datadir, infodir, and mandir.  Adjust argument parsing code.
(_AC_INIT_HELP): Update help text.
* doc/autoconf.texi (Installation Directory Variables): Document
new variables.

diff --git a/ChangeLog b/ChangeLog
index d101d6fcb920933dcc4dcd60b0c6fe2d5e0c5a82..0421e258ff077c95f971ca92da29cca6e2ea2e8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-05  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Define datarootdir,
+       docdir, htmldir, dvidir, pdfdir, psdir, and localdir.  Update
+       datadir, infodir, and mandir.  Adjust argument parsing code.
+       (_AC_INIT_HELP): Update help text.
+       * doc/autoconf.texi (Installation Directory Variables): Document
+       new variables.
+
 2005-01-04  Noah Misch  <noah@cs.caltech.edu>
 
        * lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): If the Make program does

diff --git a/NEWS b/NEWS
index 8bfe0c908198cc076a175c7efd1d2359e758e331..dd30e37945af8adf54b18be88b0f4162c8a1f6e4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,22 @@
 * Major changes in Autoconf 2.59c
 
+** Directory variables adjusted to recent changes in the GNU Coding Standards.
+  The following directory variables are new:
+
+    datarootdir   read-only architecture-independent data root [PREFIX/share]
+    localedir     locale-specific message catalogs [DATAROOTDIR/locale]
+    docdir        documentation root [DATAROOTDIR/doc/PACKAGE]
+    htmldir       html documentation [DOCDIR]
+    dvidir        dvi documentation [DOCDIR]
+    pdfdir        pdf documentation [DOCDIR]
+    psdir         ps documentation [DOCDIR]
+
+  The following variables have new default values:
+
+    datadir       read-only architecture-independent data [DATAROOTDIR]
+    infodir       info documentation [DATAROOTDIR/info]
+    mandir        man documentation [DATAROOTDIR/man]
+
 ** AC_PROG_CC_C89, AC_PROG_CC_C99
   New macros for ISO C99 support.  AC_PROG_CC_C89 and AC_PROG_CC_C99
   check for ANSI C89 and ISO C99 support respectively.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 203faa8522e2c33de7aa26298b254594deae4b12..a710ba543dc8f3d96875a2b0155fc75c2765b2c6 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2271,7 +2271,25 @@ The directory for installing executables that users run.
 
 @defvar datadir
 @ovindex datadir
-The directory for installing read-only architecture-independent data.
+The directory for installing ideosyncratic read-only
+architecture-independent data.
+@end defvar
+
+@defvar datarootdir
+@ovindex datarootdir
+The root of the directory tree for read-only architecture-independent
+data files.
+@end defvar
+
+@defvar docdir
+@ovindex docdir
+The directory for installing documentation files (other than Info and
+man).
+@end defvar
+
+@defvar dvidir
+@ovindex dvidir
+The directory for installing documentation files in DVI format.
 @end defvar
 
 @defvar exec_prefix
@@ -2283,6 +2301,11 @@ directories containing architecture-dependent files should be relative
 to @var{exec_prefix}.
 @end defvar
 
+@defvar htmldir
+@ovindex htmldir
+The directory for installing HTML documentation.
+@end defvar
+
 @defvar includedir
 @ovindex includedir
 The directory for installing C header files.
@@ -2303,6 +2326,13 @@ The directory for installing object code libraries.
 The directory for installing executables that other programs run.
 @end defvar
 
+@defvar localedir
+@ovindex localedir
+The directory for installing locale-dependent but
+architecture-independent data, such as message catalogs.  This directory
+usually has a subdirectory per locale.
+@end defvar
+
 @defvar localstatedir
 @ovindex localstatedir
 The directory for installing modifiable single-machine data.
@@ -2318,6 +2348,11 @@ The top-level directory for installing documentation in man format.
 The directory for installing C header files for non-GCC compilers.
 @end defvar
 
+@defvar pdfdir
+@ovindex pdfdir
+The directory for installing PDF documentation.
+@end defvar
+
 @defvar prefix
 @ovindex prefix
 The common installation prefix for all files.  If @var{exec_prefix}
@@ -2325,6 +2360,11 @@ is defined to a different value, @var{prefix} is used only for
 architecture-independent files.
 @end defvar
 
+@defvar psdir
+@ovindex psdir
+The directory for installing PostScript documentation.
+@end defvar
+
 @defvar sbindir
 @ovindex sbindir
 The directory for installing executables that system
@@ -2344,8 +2384,9 @@ The directory for installing read-only single-machine data.
 
 Most of these variables have values that rely on @code{prefix} or
 @code{exec_prefix}.  It is deliberate that the directory output
-variables keep them unexpanded: typically @samp{@@datadir@@} will be
-replaced by @samp{$@{prefix@}/share}, not @samp{/usr/local/share}.
+variables keep them unexpanded: typically @samp{@@datarootdir@@} will be
+replaced by @samp{$@{prefix@}/share}, not @samp{/usr/local/share}, and
+@samp{@@datadir@@} will be replaced by @samp{$@{datarootdir@}}.
 
 This behavior is mandated by the @acronym{GNU} coding standards, so that when
 the user runs:
@@ -2365,9 +2406,9 @@ the files of a package grouped together, and then install links from
 the final locations to there.
 @end table
 
-In order to support these features, it is essential that @code{datadir}
-remains being defined as @samp{$@{prefix@}/share} to depend upon the
-current value of @code{prefix}.
+In order to support these features, it is essential that
+@code{datarootdir} remains being defined as @samp{$@{prefix@}/share} to
+depend upon the current value of @code{prefix}.
 
 A corollary is that you should not use these variables except in
 Makefiles.  For instance, instead of trying to evaluate @code{datadir}

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 46f333ff9ebbe36c468667f618a7915d3930f0e3..5e56f3040c18948c15109db07b68a0b644bc479d 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -529,18 +529,28 @@ x_libraries=NONE
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 AC_SUBST([bindir],         ['${exec_prefix}/bin'])dnl
 AC_SUBST([sbindir],        ['${exec_prefix}/sbin'])dnl
 AC_SUBST([libexecdir],     ['${exec_prefix}/libexec'])dnl
-AC_SUBST([datadir],        ['${prefix}/share'])dnl
+AC_SUBST([datarootdir],    ['${prefix}/share'])dnl
+AC_SUBST([datadir],        ['${datarootdir}'])dnl
 AC_SUBST([sysconfdir],     ['${prefix}/etc'])dnl
 AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
 AC_SUBST([localstatedir],  ['${prefix}/var'])dnl
-AC_SUBST([libdir],         ['${exec_prefix}/lib'])dnl
 AC_SUBST([includedir],     ['${prefix}/include'])dnl
 AC_SUBST([oldincludedir],  ['/usr/include'])dnl
-AC_SUBST([infodir],        ['${prefix}/info'])dnl
-AC_SUBST([mandir],         ['${prefix}/man'])dnl
+AC_SUBST([docdir],         [m4_ifset([AC_PACKAGE_TARNAME],
+                                     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
+                                     ['${datarootdir}/doc/${PACKAGE}'])])dnl
+AC_SUBST([infodir],        ['${datarootdir}/info'])dnl
+AC_SUBST([htmldir],        ['${docdir}'])dnl
+AC_SUBST([dvidir],         ['${docdir}'])dnl
+AC_SUBST([pdfdir],         ['${docdir}'])dnl
+AC_SUBST([psdir],          ['${docdir}'])dnl
+AC_SUBST([libdir],         ['${exec_prefix}/lib'])dnl
+AC_SUBST([localedir],      ['${datarootdir}/locale'])dnl
+AC_SUBST([mandir],         ['${datarootdir}/man'])dnl
 
 ac_prev=
 ac_dashdash=
@@ -581,12 +591,18 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
@@ -595,6 +611,11 @@ do
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
     eval "enable_$ac_feature=no" ;;
 
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([[^=]]*\)'`
     # Reject names that are not valid shell variable names.
@@ -632,6 +653,12 @@ do
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -656,13 +683,16 @@ do
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -727,6 +757,16 @@ do
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -854,8 +894,10 @@ do
 done
 
 # Be sure to have absolute directory names.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-             localstatedir libdir includedir oldincludedir infodir mandir
+for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir \
+              sharedstatedir localstatedir includedir oldincludedir \
+              docdir infodir htmldir dvidir pdfdir psdir libdir \
+              localedir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
@@ -946,15 +988,22 @@ Fine tuning of the installation directories:
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root ]@<:@DATAROOTDIR/doc/m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [PACKAGE])@:>@[
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF]