[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-291-g32386e0

[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=32386e0dc162a86ad7cfd4da3e021a3369129b99

The branch, master has been updated
       via  32386e0dc162a86ad7cfd4da3e021a3369129b99 (commit)
      from  12856eb28cc576237b9c6b123af912e76abfc1aa (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 32386e0dc162a86ad7cfd4da3e021a3369129b99
Author: Karl Berry <address@hidden>
Date:   Tue Apr 14 21:43:08 2009 +0200

    manual: improve markup: itemize list in `Extending'.
    
    * doc/automake.texi (Extending): Use address@hidden's for user override
    semantics.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog         |    6 ++++++
 doc/automake.texi |   16 +++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc419d7..7d8a116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-14  Karl Berry  <address@hidden>
+
+       manual: improve markup: itemize list in `Extending'.
+       * doc/automake.texi (Extending): Use address@hidden's for user override
+       semantics.
+
 2009-04-13  Ralf Wildenhues  <address@hidden>
 
        bin_PROGRAMS = $(EXTRA_PROGRAMS) should work.
diff --git a/doc/automake.texi b/doc/automake.texi
index de46d21..c5ac962 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -9314,12 +9314,18 @@ different places (@file{Makefile.am}, 
@file{configure.ac}, and
 @command{automake} itself), it is possible to have conflicting
 definitions of rules or variables.  When building @file{Makefile.in}
 the following priorities are respected by @command{automake} to ensure
-the user always has the last word.  User defined variables in
address@hidden have priority over variables @code{AC_SUBST}ed from
address@hidden, and @code{AC_SUBST}ed variables have priority
-over @command{automake}-defined variables.  As far as rules are
-concerned, a user-defined rule overrides any
+the user always has the last word:
+
address@hidden
address@hidden
+User defined variables in @file{Makefile.am} have priority over
+variables @code{AC_SUBST}ed from @file{configure.ac}, and
address@hidden variables have priority over
address@hidden variables.
address@hidden
+As far as rules are concerned, a user-defined rule overrides any
 @command{automake}-defined rule for the same target.
address@hidden itemize
 
 @cindex overriding rules
 @cindex overriding semantics


hooks/post-receive
--
GNU Automake