For Debian Bug #39542:

* automake.texi (Invoking Automake, Optional): Document how
AC_CONFIG_AUX_DIR interacts with missing files.

diff --git a/ChangeLog b/ChangeLog
index 52480c754d2a02f80834b185ca59ec90150995f3..8e21cfec5626460a381558589d89db5b66889900 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-02  Jeremy Nimmer  <jwnimmer@alum.mit.edu>  (tiny change)
+
+       For Debian Bug #39542:
+       * automake.texi (Invoking Automake, Optional): Document how
+       AC_CONFIG_AUX_DIR interacts with missing files.
+
 2003-02-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/DisjConditions.pm (_permutations_worker)

diff --git a/THANKS b/THANKS
index 18dc47179773d3614c21e5cc055b39fb48efee22..5eae3680ca3cad29f0ca8b07e462c859bad67c67 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -87,6 +87,7 @@ Jason Molenda         crash@cygnus.co.jp
 Jeff Bailey            Jbailey@phn.ca
 Jeff Garzik            jgarzik@pobox.com
 Jens Krüger            jens_krueger@physik.tu-muenchen.de
+Jeremy Nimmer          jwnimmer@alum.mit.edu
 Jerome Lovy            jlovy@multimania.com
 Jerome Santini         santini@chambord.univ-orleans.fr
 Jim Meyering           meyering@na-net.ornl.gov

diff --git a/automake.texi b/automake.texi
index 5e1857dbc0f819ee1205a2c30e1e5a4eac10a5ab..327ba2844c4a22568e5d69a83b9965ef35cc3d0f 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -944,6 +944,12 @@ general if Automake tells you a file is missing, try using this option.
 By default Automake tries to make a symbolic link pointing to its own
 copy of the missing file; this can be changed with @code{--copy}.
 
+Many of the potentially-missing files are common scripts whose
+location may be specified via the @code{AC_CONFIG_AUX_DIR} macro.
+Therefore, @code{AC_CONFIG_AUX_DIR}'s setting affects whether a
+file is considered missing, and where the missing file is added
+(@pxref{Optional}).
+
 @item --libdir=@var{dir}
 @opindex --libdir
 Look for Automake data files in directory @var{dir} instead of in the
@@ -1159,13 +1165,23 @@ of Automake required the use of @code{AM_CONFIG_HEADER}
 @item AC_CONFIG_AUX_DIR
 Automake will look for various helper scripts, such as
 @file{mkinstalldirs}, in the directory named in this macro invocation.
-If not seen, the scripts are looked for in their @samp{standard}
-locations (either the top source directory, or in the source directory
-corresponding to the current @file{Makefile.am}, whichever is
-appropriate).  @xref{Input, , Finding `configure' Input, autoconf, The
-Autoconf Manual}.
+@c This list is accurate relative to version 1.7.2
+(The full list of scripts is: @file{config.guess}, @file{config.sub},
+@file{depcomp}, @file{elisp-comp}, @file{compile}, @file{install-sh},
+@file{ltmain.sh}, @file{mdate-sh}, @file{missing}, @file{mkinstalldirs},
+@file{py-compile}, @file{texinfo.tex}, and @file{ylwrap}.)  Not all
+scripts are always searched for; some scripts will only be sought if the
+generated @file{Makefile.in} requires them.
 @cvindex AC_CONFIG_AUX_DIR
-@c FIXME: give complete list of things looked for in this directory
+
+If @code{AC_CONFIG_AUX_DIR} is not given, the scripts are looked for in
+their @samp{standard} locations.  For @file{mdate-sh},
+@file{texinfo.tex}, and @file{ylwrap}, the standard location is the
+source directory corresponding to the current @file{Makefile.am}.  For
+the rest, the standard location is the first one of @file{.}, @file{..},
+or @file{../..} (relative to the top source directory) that provides any
+one of the helper scripts.  @xref{Input, , Finding `configure' Input,
+autoconf, The Autoconf Manual}.
 
 @item AC_CANONICAL_HOST
 Automake will ensure that @file{config.guess} and @file{config.sub}

diff --git a/stamp-vti b/stamp-vti
index b1f98f259b3eff043b60727664c4e9f20bdf226d..fbdd1783005bea63fa5dd401d7e341317cab370b 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 1 February 2003
+@set UPDATED 2 February 2003
 @set UPDATED-MONTH February 2003
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/version.texi b/version.texi
index b1f98f259b3eff043b60727664c4e9f20bdf226d..fbdd1783005bea63fa5dd401d7e341317cab370b 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 1 February 2003
+@set UPDATED 2 February 2003
 @set UPDATED-MONTH February 2003
 @set EDITION 1.7a
 @set VERSION 1.7a