* doc/automake.texi (Requirements): Show one example of

AC_CONFIG_FILES with multiple outputs, and correct a few typos.

diff --git a/ChangeLog b/ChangeLog
index 100dd11..3bc7399 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * doc/automake.texi (Requirements): Show one example of
+       AC_CONFIG_FILES with multiple outputs, and correct a few typos.
+
        * aclocal.in ($serial_line_rx): Expect at least one space between
        `serial' and the following number.
        Report from Jim Meyering.

diff --git a/doc/automake.texi b/doc/automake.texi
index 4e77e11..33b0f73 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1286,6 +1286,21 @@ by @code{AM_INIT_AUTOMAKE}:
 @itemx AC_OUTPUT
 @acindex AC_CONFIG_FILES
 @acindex AC_OUTPUT
+These two macros are usually invoked as follows near the end of
+@file{configure.ac}.
+
+@example
+@dots{}
+AC_CONFIG_FILES([
+  Makefile
+  doc/Makefile
+  src/Makefile
+  src/lib/Makefile
+  @dots{}
+])
+AC_OUTPUT
+@end example
+
 Automake uses these to determine which files to create (@pxref{Output, ,
 Creating Output Files, autoconf, The Autoconf Manual}).  A listed file
 is considered to be an Automake generated @file{Makefile} if there
@@ -1301,14 +1316,14 @@ to be Automake generated.
 
 Files created by @code{AC_CONFIG_FILES}, be they Automake
 @file{Makefile}s or not, are all removed by @code{make distclean}.
-Their inputs are automatically distributed, except for input that
-turns out the be the outputs of prior @code{AC_CONFIG_FILES} commands.
+Their inputs are automatically distributed, except for inputs that
+turn out the be outputs of prior @code{AC_CONFIG_FILES} commands.
 Finally, rebuild rules are generated in the Automake @file{Makefile}
-in the subdirectory of the output file, if there is one, or in the
-top-level @file{Makefile} otherwise.
+existing in the subdirectory of the output file, if there is one, or
+in the top-level @file{Makefile} otherwise.
 
 The above machinery (cleaning, distributing, and rebuilding) works
-fine only if the @code{AC_CONFIG_FILES} specifications contain only
+fine if the @code{AC_CONFIG_FILES} specifications contain only
 literals.  If part of the specification uses shell variables,
 @command{automake} will not be able to fulfil this setup, and you will
 have to complete the missing bits by hand.  For instance on

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 7ece8d4..c9bd5ee 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 6 February 2005
+@set UPDATED 7 February 2005
 @set UPDATED-MONTH February 2005
 @set EDITION 1.9a
 @set VERSION 1.9a

diff --git a/doc/version.texi b/doc/version.texi
index 7ece8d4..c9bd5ee 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 6 February 2005
+@set UPDATED 7 February 2005
 @set UPDATED-MONTH February 2005
 @set EDITION 1.9a
 @set VERSION 1.9a