[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.1-102-g488de31

[Stefano Lattarini]

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=488de31efa525d864ad56cd023f3b33c83101088

The branch, master has been updated
       via  488de31efa525d864ad56cd023f3b33c83101088 (commit)
       via  d0dc448517d3a61ba55e62dd76b9a42b68bef8f8 (commit)
       via  9c6ee0cdc01f2c9ac2cf9dd780a681c9ffc0ee7f (commit)
       via  0f330313ccadc5c027e482f9e3fc8a05bb57e375 (commit)
      from  7c6310c3a069ad18b3be277be606c7109f8e9a82 (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 488de31efa525d864ad56cd023f3b33c83101088
Merge: 7c6310c d0dc448
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 21 13:15:05 2012 +0200

    Merge branch 'maint'
    
    * maint:
      docs: avoid failures with development version of Texinfo (4.13.90)
      typofix: s/test derivers/test drivers/ in check.am comments
      typofix: s/env/even/ in comments in GNUmakefile

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

Summary of changes:
 GNUmakefile               |    2 +-
 doc/automake-history.texi |    6 +++---
 lib/am/check.am           |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 20af004..7ab58ca 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -19,7 +19,7 @@ ifeq ($(filter bootstrap,$(MAKECMDGOALS)),)
 
 ifeq ($(wildcard Makefile),)
   # Any target but 'bootstrap' specified in an unconfigured tree
-  # is an error, env when the user is running GNU make.
+  # is an error, even when the user is running GNU make.
   $(warning There seems to be no Makefile in this directory.)
   $(warning You must run ./configure before running 'make'.)
   $(error Fatal Error)
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
index 7bbdeb4..3d2d57e 100644
--- a/doc/automake-history.texi
+++ b/doc/automake-history.texi
@@ -792,7 +792,7 @@ nicely.  Conditionals, Locations, Variable and Rule 
definitions,
 Options: these items on which Automake works have been rewritten as
 separate Perl modules, and documented.
 
address@hidden 2004-01-11 Automake 1.8.1
address@hidden 2004-01-11 Automake 1.8.1
 @itemx 2004-01-12 Automake 1.8.2
 @itemx 2004-03-07 Automake 1.8.3
 @itemx 2004-04-25 Automake 1.8.4
@@ -809,13 +809,13 @@ down to address@hidden
 
 Aside from this it contains mainly minor changes and bug-fixes.
 
address@hidden 2004-08-11 Automake 1.9.1
address@hidden 2004-08-11 Automake 1.9.1
 @itemx 2004-09-19 Automake 1.9.2
 
 Automake has ten years.  This chapter of the manual was initially
 written for this occasion.
 
address@hidden 2007-10-29 Automake repository moves to @code{savannah.gnu.org}
address@hidden 2007-10-29 Automake repository moves to @code{savannah.gnu.org}
 and uses git as primary repository.
 
 @end table
diff --git a/lib/am/check.am b/lib/am/check.am
index 67b254f..ad970ad 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -56,7 +56,7 @@ include inst-vars.am
 ## originally written at EPITA/LRDE, further developed at Gostai, then made
 ## its way from GNU coreutils to end up, largely rewritten, in Automake.
 ## The current version is an heavy rewrite of that, to allow for support
-## of more test metadata, and the use of custom test derivers and protocols
+## of more test metadata, and the use of custom test drivers and protocols
 ## (among them, TAP).
 
 am__recheck_rx = ^[    ]*:recheck:[    ]*


hooks/post-receive
-- 
GNU Automake