[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-55-g3432459

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=343245998c0631e1a95f396ee17c3128605be4f2

The branch, branch-1-10 has been updated
       via  343245998c0631e1a95f396ee17c3128605be4f2 (commit)
       via  193b6e3ed61b1c742e7cd63ddf32ab46c2e05d33 (commit)
      from  eedc6603a4ad6f768f9e512b9b47cb9d3ee168d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 343245998c0631e1a95f396ee17c3128605be4f2
Author: William Pursell <address@hidden>
Date:   Sat Nov 22 15:06:50 2008 +0100

    Fix more typos and grammaros in the manual.
    
    * doc/automake.texi (VPATH Builds, Nested Packages)
    (Auxiliary Programs, Invoking Automake, Requirements, Optional):
    Fix typos and grammaros, correct URL to 'config' source
    repository.  Rewrite description of AC_SUBST.
    (true): Cross-reference to `Default _SOURCES' node.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 193b6e3ed61b1c742e7cd63ddf32ab46c2e05d33
Author: William Pursell <address@hidden>
Date:   Sat Nov 22 14:53:40 2008 +0100

    Quote APIVERSION in configure.ac.
    
    * configure.ac: Quote APIVERSION.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   13 +++++++++++++
 configure.ac      |    2 +-
 doc/automake.texi |   49 ++++++++++++++++++++++++++-----------------------
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a8efba..bd25cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-11-22  William Pursell  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (VPATH Builds, Nested Packages)
+       (Auxiliary Programs, Invoking Automake, Requirements, Optional):
+       Fix typos and grammaros, correct URL to 'config' source
+       repository.  Rewrite description of AC_SUBST.
+       (true): Cross-reference to `Default _SOURCES' node.
+
+2008-11-22  William Pursell  <address@hidden>
+
+       * configure.ac: Quote APIVERSION.
+
 2008-11-22  Ralf Wildenhues  <address@hidden>
 
        When installing COPYING, recommend adding the file to VCS.
diff --git a/configure.ac b/configure.ac
index 42e40bd..48ff7bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AM_INIT_AUTOMAKE([1.8a dist-bzip2 filename-length-max=99])
 # * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
 #   aren't the same.
 APIVERSION=`echo "$VERSION" | sed -e 
's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
-AC_SUBST(APIVERSION)
+AC_SUBST([APIVERSION])
 
 # A versioned directory, defined here for convenience.
 AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"])
diff --git a/doc/automake.texi b/doc/automake.texi
index ed65bdf..4db1ff3 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -111,7 +111,7 @@ section entitled address@hidden Free Documentation 
License.''
 * Rebuilding::                  Automatic rebuilding of Makefile
 * Options::                     Changing Automake's behavior
 * Miscellaneous::               Miscellaneous rules
-* Include::                     Including extra files in an Automake template.
+* Include::                     Including extra files in an Automake template
 * Conditionals::                Conditionals
 * Gnits::                       The effect of @option{--gnu} and 
@option{--gnits}
 * Cygnus::                      The effect of @option{--cygnus}
@@ -874,7 +874,7 @@ On the first host, you could create a local build directory:
 @end example
 
 @noindent
-(Here we assume the that installer has configured @command{sudo} so it
+(Here we assume that the installer has configured @command{sudo} so it
 can execute @code{make install} with root privileges; it is more convenient
 than using @command{su} like in @ref{Basic Installation}).
 
@@ -1250,7 +1250,7 @@ Autoconfiscated packages (that means packages whose build 
system have
 been created by Autoconf and friends) can be nested to arbitrary
 depth.
 
-A typical setup is that a package A will distribute one of the libraries
+A typical setup is that package A will distribute one of the libraries
 it needs in a subdirectory.  This library B is a complete package with
 its own GNU Build System.  The @command{configure} script of A will
 run the @command{configure} script of B as part of its execution,
@@ -2050,8 +2050,8 @@ source in case you need more recent versions.
 @table @code
 @item ansi2knr.c
 @itemx ansi2knr.1
-These two files are used by the obsolete de-ANSI-fication support
-(@pxref{ANSI}).
+These two files are used for de-ANSI-fication support (obsolete
address@hidden).
 
 @item compile
 This is a wrapper for compilers that do not accept options @option{-c}
@@ -2066,7 +2066,7 @@ support new architectures and fix probes broken by 
changes in new
 kernel versions.  Each new release of Automake comes with up-to-date
 copies of these programs.  If your copy of Automake is getting old,
 you are encouraged to fetch the latest versions of these files from
address@hidden://savannah.gnu.org/cvs/?group=config} before making a
address@hidden://savannah.gnu.org/git/?group=config} before making a
 release.
 
 @item config-ml.in
@@ -2112,7 +2112,7 @@ This is used to byte-compile Python scripts.
 
 @item symlink-tree
 This program duplicates a tree of directories, using symbolic links
-instead of copying files.  Such operation is performed when building
+instead of copying files.  Such an operation is performed when building
 multilibs (@pxref{Multilibs}).  This file is maintained in the GCC
 tree at @url{http://gcc.gnu.org/svn.html}.
 
@@ -2245,7 +2245,8 @@ false.o: true.c
 @end example
 
 Note that there is no @code{true_SOURCES} definition.  Automake will
-implicitly assume that there is a source file named @file{true.c}, and
+implicitly assume that there is a source file named @file{true.c}
+(@pxref{Default _SOURCES}), and
 define rules to compile @file{true.o} and link @file{true}.  The
 @samp{true.o: true.c} rule supplied by the above @file{Makefile.am},
 will override the Automake generated rule to build @file{true.o}.
@@ -2363,7 +2364,7 @@ have to run @command{autoconf} yourself for this purpose.
 @opindex -a
 @opindex --add-missing
 Automake requires certain common files to exist in certain situations;
-for instance, @file{config.guess} is required if @file{configure.ac} runs
+for instance, @file{config.guess} is required if @file{configure.ac} invokes
 @code{AC_CANONICAL_HOST}.  Automake is distributed with several of these
 files (@pxref{Auxiliary Programs}); this option will cause the missing
 ones to be automatically added to the package, whenever possible.  In
@@ -2465,7 +2466,7 @@ created.
 Print the version number of Automake and exit.
 
 @item -W CATEGORY
address@hidden address@hidden
address@hidden address@hidden
 @opindex -W
 @opindex --warnings
 Output warnings falling in @var{category}.  @var{category} can be
@@ -2590,8 +2591,8 @@ file is not considered to be generated by Automake.
 
 Files created by @code{AC_CONFIG_FILES}, be they Automake
 @file{Makefile}s or not, are all removed by @samp{make distclean}.
-Their inputs are automatically distributed, except for inputs that
-turn out the be outputs of prior @code{AC_CONFIG_FILES} commands.
+Their inputs are automatically distributed, unless they
+are the output of prior @code{AC_CONFIG_FILES} commands.
 Finally, rebuild rules are generated in the Automake @file{Makefile}
 existing in the subdirectory of the output file, if there is one, or
 in the top-level @file{Makefile} otherwise.
@@ -2612,7 +2613,7 @@ AC_CONFIG_FILES([output:$file],, [file=$file])
 @command{automake} will output rules to clean @file{output}, and
 rebuild it.  However the rebuild rule will not depend on @file{input},
 and this file will not be distributed either.  (You must add
address@hidden = input} to your @file{Makefile} if @file{input} is a
address@hidden = input} to your @file{Makefile.am} if @file{input} is a
 source file.)
 
 Similarly
@@ -2739,7 +2740,7 @@ macro.
 @item AC_CONFIG_HEADERS
 Automake will generate rules to rebuild these headers.  Older versions
 of Automake required the use of @code{AM_CONFIG_HEADER}
-(@pxref{Macros}); this is no longer the case today.
+(@pxref{Macros}); this is no longer the case.
 
 As for @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the
 specification using shell variables will be ignored as far as
@@ -2822,10 +2823,11 @@ If a Lex source file is seen, then this macro must be 
used.
 Autoconf Manual}.
 
 @item AC_REQUIRE_AUX_FILE
address@hidden will ensure each file for which this macro is
-called exists in the aux directory, and will complain otherwise.  It
+For each @code{AC_REQUIRE_AUX_FILE(address@hidden)},
address@hidden will ensure that @address@hidden exists in the
+aux directory, and will complain otherwise.  It
 will also automatically distribute the file.  This macro should be
-used by third-party Autoconf macros that requires some supporting
+used by third-party Autoconf macros that require some supporting
 files in the aux directory specified with @code{AC_CONFIG_AUX_DIR}
 above.  @xref{Input, , Finding @command{configure} Input, autoconf,
 The Autoconf Manual}.
@@ -2835,12 +2837,13 @@ The first argument is automatically defined as a 
variable in each
 generated @file{Makefile.in}.  @xref{Setting Output Variables, , Setting
 Output Variables, autoconf, The Autoconf Manual}.
 
-If the Autoconf manual says that a macro calls @code{AC_SUBST} for
address@hidden, or defines the output variable @var{var} then @var{var} will
-be defined in each @file{Makefile.in} generated by Automake.
-E.g.@: @code{AC_PATH_XTRA} defines @code{X_CFLAGS} and @code{X_LIBS}, so
-you can use these variables in any @file{Makefile.am} if
address@hidden is called.
+For every substituted variable @var{var}, @command{automake} will add
+a line @address@hidden = @var{value}} to each @file{Makefile.in} file.
+Many Autoconf macros invoke @code{AC_SUBST} to set output variables
+this way, e.g., @code{AC_PATH_XTRA} defines @code{X_CFLAGS} and
address@hidden  Thus, you can access these variables as
address@hidden(X_CFLAGS)} and @code{$(X_LIBS)} in any @file{Makefile.am}
+if @code{AC_PATH_XTRA} is called.
 
 @item AM_C_PROTOTYPES
 This is required when using the obsolete de-ANSI-fication feature; see


hooks/post-receive
--
GNU Automake