[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-356-g35597a7

[Eric Blake]

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=35597a759c91a414460eb8d4f9e138a64f317944

The branch, master has been updated
       via  35597a759c91a414460eb8d4f9e138a64f317944 (commit)
       via  978dfcf5d79630e656a6c1e99a7a8cf2a838688a (commit)
      from  27d06b631ca93d1fb9fc3a21013c8fd096270d9c (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 35597a759c91a414460eb8d4f9e138a64f317944
Merge: 27d06b6 978dfcf
Author: Eric Blake <address@hidden>
Date:   Fri Sep 17 14:17:07 2010 -0600

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog                   |   13 +++++++++++++
 ChangeLog.03                |    2 +-
 automake.in                 |    2 +-
 lib/Automake/ChannelDefs.pm |    2 +-
 lib/Automake/Channels.pm    |    2 +-
 lib/Automake/Rule.pm        |    2 +-
 lib/Automake/Variable.pm    |    2 +-
 lib/am/distdir.am           |    2 +-
 tests/insthook.test         |    4 ++--
 9 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c394cc..6c0402e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-17  Eric Blake  <address@hidden>
+
+       Avoid triple-space after period.
+       * automake.in (handle_single_transform): Avoid 3 spaces at
+       sentence end.
+       * ChangeLog.03: Likewise.
+       * lib/Automake/ChannelDefs.pm: Likewise.
+       * lib/Automake/Channels.pm (_print_message): Likewise.
+       * lib/Automake/Rule.pm (rule): Likewise.
+       * lib/Automake/Variable.pm (var): Likewise.
+       * lib/am/distdir.am: Likewise.
+       * tests/insthook.test: Likewise.
+
 2010-09-15  Stefano Lattarini  <address@hidden>
 
        Test automake-generated portions of configure help screen.
diff --git a/ChangeLog.03 b/ChangeLog.03
index aa31380..eb5b251 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -1325,7 +1325,7 @@
        Makefile.am into DIST_COMMON here.
        * lib/am/configure.am (DIST_COMMON): Do it here, and use
        %MAKEFILE-AM% and %MAKEFILE-IN% so that items in DIST_COMMON
-       actually match the targets.   Prefix `configure' with `$(srcdir)/'
+       actually match the targets.  Prefix `configure' with `$(srcdir)/'
        to match the target.
        * tests/remake4.test: New file.
        * tests/Makefile.am (TESTS): Add remake4.test.
diff --git a/automake.in b/automake.in
index 7798bb0..3897de4 100644
--- a/automake.in
+++ b/automake.in
@@ -2005,7 +2005,7 @@ sub handle_single_transform ($$$$$%)
 
                # Each item on this list is a reference to a list consisting
                # of four values followed by additional transform flags for
-               # file_contents.   The four values are the derived flag prefix
+               # file_contents.  The four values are the derived flag prefix
                # (e.g. for `foo_CFLAGS', it is `foo'), the name of the
                # source file, the base name of the output file, and
                # the extension for the object file.
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 57948bd..470e6c7 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -80,7 +80,7 @@ Fatal errors.  Use C<&fatal> to send messages over this 
channel.
 
 =item C<error>
 
-Common errors.   Use C<&error> to send messages over this channel.
+Common errors.  Use C<&error> to send messages over this channel.
 
 =item C<error-gnu>
 
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index aeed4db..7b30766 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -503,7 +503,7 @@ sub _print_message ($$%)
   my $msg = _format_message ($location, $message, %opts);
   if ($opts{'partial'})
     {
-      # Incomplete message.   Store, don't print.
+      # Incomplete message.  Store, don't print.
       $partial .= $msg;
       return;
     }
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index d9d9ae0..b603120 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -488,7 +488,7 @@ sub suffixes ()
 =item C<rule ($rulename)>
 
 Return the C<Automake::Rule> object for the rule
-named C<$rulename> if defined.   Return 0 otherwise.
+named C<$rulename> if defined.  Return 0 otherwise.
 
 =cut
 
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index f75ec10..9b2c838 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -354,7 +354,7 @@ sub reset ()
 =item C<var ($varname)>
 
 Return the C<Automake::Variable> object for the variable
-named C<$varname> if defined.   Return 0 otherwise.
+named C<$varname> if defined.  Return 0 otherwise.
 
 =cut
 
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index fd82838..a11d3a4 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -140,7 +140,7 @@ endif %?TOPDIR_P%
 ## we are not stripping a legitimate filename that starts with the
 ## same pattern as $(srcdir)?
 ## Well, it can't happen without the Makefile author distributing
-## something out of the distribution (which is bad).   As an example,
+## something out of the distribution (which is bad).  As an example,
 ## consider `EXTRA_DIST = ../bar'.  This is an issue if $srcdir is `..',
 ## however getting this value for srcdir is impossible: `EXTRA_DIST = ../bar'
 ## implies we are in a subdirectory (so `../bar' is within the package),
diff --git a/tests/insthook.test b/tests/insthook.test
index 5a82bd6..a315447 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2005, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2007, 2010  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ test -f ok
 
 # Make sure that installing a second version doesn't erase the first
 # one.  (This is error prone since `foo' symlinks to `foo-1.0' and the
-# second version will overwrite `foo'.   Hopefully `install' and `install-sh'
+# second version will overwrite `foo'.  Hopefully `install' and `install-sh'
 # are smart enough to erase the `foo' symlink before installing the new
 # version.)
 ./configure "--bindir=`pwd`/bin"


hooks/post-receive
-- 
GNU Automake