autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: update standard installation directories


From: Alexandre Duret-Lutz
Subject: Re: update standard installation directories
Date: Tue, 04 Jan 2005 23:28:36 +0100
User-agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux)

[...]
 Paul> looked OK to me.  I was hoping Bruno could take a quick look at it
 Paul> before installing.  But if he doesn't respond in an another week or
 Paul> so, let's install it.

Here is a new version, including Bruno's suggestions.  
I'll install it tomorrow.

2005-01-05  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.334
diff -u -r1.334 NEWS
--- NEWS        3 Jan 2005 07:35:21 -0000       1.334
+++ NEWS        4 Jan 2005 22:26:56 -0000
@@ -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.
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.860
diff -u -r1.860 autoconf.texi
--- doc/autoconf.texi   3 Jan 2005 08:31:44 -0000       1.860
+++ doc/autoconf.texi   4 Jan 2005 22:15:46 -0000
@@ -2270,7 +2270,25 @@
 
 @defvar datadir
 @ovindex datadir
-The directory for installing read-only architecture-independent data.
+The directory for installing ideosyncratic read-only
+architecture-independent data.
address@hidden defvar
+
address@hidden datarootdir
address@hidden datarootdir
+The root of the directory tree for read-only architecture-independent
+data files.
address@hidden defvar
+
address@hidden docdir
address@hidden docdir
+The directory for installing documentation files (other than Info and
+man).
address@hidden defvar
+
address@hidden dvidir
address@hidden dvidir
+The directory for installing documentation files in DVI format.
 @end defvar
 
 @defvar exec_prefix
@@ -2282,6 +2300,11 @@
 to @var{exec_prefix}.
 @end defvar
 
address@hidden htmldir
address@hidden htmldir
+The directory for installing HTML documentation.
address@hidden defvar
+
 @defvar includedir
 @ovindex includedir
 The directory for installing C header files.
@@ -2302,6 +2325,13 @@
 The directory for installing executables that other programs run.
 @end defvar
 
address@hidden localedir
address@hidden localedir
+The directory for installing locale-dependent but
+architecture-independent data, such as message catalogs.  This directory
+usually has a subdirectory per locale.
address@hidden defvar
+
 @defvar localstatedir
 @ovindex localstatedir
 The directory for installing modifiable single-machine data.
@@ -2317,6 +2347,11 @@
 The directory for installing C header files for non-GCC compilers.
 @end defvar
 
address@hidden pdfdir
address@hidden pdfdir
+The directory for installing PDF documentation.
address@hidden defvar
+
 @defvar prefix
 @ovindex prefix
 The common installation prefix for all files.  If @var{exec_prefix}
@@ -2324,6 +2359,11 @@
 architecture-independent files.
 @end defvar
 
address@hidden psdir
address@hidden psdir
+The directory for installing PostScript documentation.
address@hidden defvar
+
 @defvar sbindir
 @ovindex sbindir
 The directory for installing executables that system
@@ -2343,8 +2383,9 @@
 
 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 @address@hidden@}/share}, not @samp{/usr/local/share}.
+variables keep them unexpanded: typically @samp{@@datarootdir@@} will be
+replaced by @address@hidden@}/share}, not @samp{/usr/local/share}, and
address@hidden@@datadir@@} will be replaced by @address@hidden@}}.
 
 This behavior is mandated by the @acronym{GNU} coding standards, so that when
 the user runs:
@@ -2364,9 +2405,9 @@
 the final locations to there.
 @end table
 
-In order to support these features, it is essential that @code{datadir}
-remains being defined as @address@hidden@}/share} to depend upon the
-current value of @code{prefix}.
+In order to support these features, it is essential that
address@hidden remains being defined as @address@hidden@}/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}
Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.839
diff -u -r1.839 general.m4
--- lib/autoconf/general.m4     3 Jan 2005 21:54:43 -0000       1.839
+++ lib/autoconf/general.m4     4 Jan 2005 22:15:46 -0000
@@ -529,18 +529,28 @@
 # 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 @@
   --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 @@
     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 @@
   -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 @@
   | --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 @@
   | --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 @@
 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 @@
   --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]
-- 
Alexandre Duret-Lutz





reply via email to

[Prev in Thread] Current Thread [Next in Thread]