[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-29-g55bead3

[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=55bead34fa50168252ffe716a78bf7312dbc6d85

The branch, branch-1.11 has been updated
       via  55bead34fa50168252ffe716a78bf7312dbc6d85 (commit)
       via  689a2b1b932a0a954d70a7f93cbcf067ad8c8751 (commit)
       via  d5441f98f7f81c3a1486ddca8d7b4a967c074c39 (commit)
       via  11e738d45251de0251904cee58aa06a231f9ef6f (commit)
      from  54d9ecc4ab64a10d551a142321016e483cdc0b79 (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 55bead34fa50168252ffe716a78bf7312dbc6d85
Merge: 54d9ecc4ab64a10d551a142321016e483cdc0b79 
689a2b1b932a0a954d70a7f93cbcf067ad8c8751
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Sep 18 20:14:14 2009 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 .gitattributes    |    1 +
 ChangeLog         |   11 +++++++++++
 doc/automake.texi |    4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index e8495d5..b6c3614 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 ChangeLog merge=merge-changelog
+*.texi* diff=texinfo
diff --git a/ChangeLog b/ChangeLog
index b4834be..21cfefc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-18  Peter Johansson  <address@hidden>  (tiny change)
+
+       Fix link to "Recursive Make Considered Harmful" paper.
+       * doc/automake.texi (Alternative): Fix broken URL.
+
+2009-09-11  Reuben Thomas <address@hidden>  (tiny patch)
+
+       Fix outdated reference to sh-utils in the manual.
+       * doc/automake.texi (Options): The reference to `sh-utils'
+       should be to `coreutils'.
+
 2009-09-06  Ralf Wildenhues  <address@hidden>
 
        Avoid sleeping for one second most of the time in sanity check.
diff --git a/doc/automake.texi b/doc/automake.texi
index b3f4a76..f6633d8 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4345,7 +4345,7 @@ variables it cannot ensure the corresponding directory 
exists.
 @section An Alternative Approach to Subdirectories
 
 If you've ever read Peter Miller's excellent paper,
address@hidden://www.pcug.org.au/~millerp/rmch/recu-make-cons-harm.html,
address@hidden://miller.emu.id.au/pmiller/books/rmch/,
 Recursive Make Considered Harmful}, the preceding sections on the use of
 subdirectories will probably come as unwelcome advice.  For those who
 haven't read the paper, Miller's main thesis is that recursive
@@ -9203,7 +9203,7 @@ run-time dependencies are satisfied after installation.
 
 @vindex AM_INSTALLCHECK_STD_OPTIONS_EXEMPT
 In a few situations, programs (or scripts) have to be exempted from this
-test.  For instance, @command{false} (from GNU sh-utils) is never
+test.  For instance, @command{false} (from GNU coreutils) is never
 successful, even for @option{--help} or @option{--version}.  You can list
 such programs in the variable @code{AM_INSTALLCHECK_STD_OPTIONS_EXEMPT}.
 Programs (not scripts) listed in this variable should be suffixed by


hooks/post-receive
-- 
GNU Automake