Fix capitalization of error messages, reword one message.

* lib/Automake/Variable.pm (define): Do not capitalize the first
word in the error message.
* automake.in (require_file_internal): Likewise.  Also, reword
and line-wrap for better readability.
* tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
Adjust tests.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 9a0b3329c16a0ad78e6f9d4683b6922a5f72fbe1..6ed3c6f431170aa0686f47ce76cf5e55269e1b4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-04-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix capitalization of error messages, reword one message.
+       * lib/Automake/Variable.pm (define): Do not capitalize the first
+       word in the error message.
+       * automake.in (require_file_internal): Likewise.  Also, reword
+       and line-wrap for better readability.
+       * tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
+       Adjust tests.
+
        Fix connected warnings about obsolete exeext override.
        * lib/Automake/Rule.pm (define): Merge two warnings that belong
        together, by setting the 'partial' flag for the first one.

diff --git a/automake.in b/automake.in
index d5e3ec21c26e6667a38e1f777b284cb309e93f78..4a753db1ec98c1b07360d13a32a8a7027cc59904 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -7914,8 +7914,9 @@ sub require_file_internal ($$$@)
                          # the top level Makefile.  Furthermore Automake
                          # hasn't been asked to create the Makefile.in
                          # that distributes the aux dir files.
-                         error ($where, 'Please make a full run of automake'
-                                . " so $fullfile gets distributed.");
+                         error ($where, 'please rerun automake without '
+                                . "Makefile arguments\n"
+                                . "so $fullfile gets distributed.");
                        }
                    }
                }

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index c340dc70d0c09ce8b76c1304cf555cb88af55fa4..bf44c3852e8f98729ec48a42812e8ebd7e1a43e3 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -996,10 +996,10 @@ sub define ($$$$$$$$)
          if (! $undef_cond->false)
            {
              error ($where,
-                    "Cannot apply `+=' because `$var' is not defined "
+                    "cannot apply `+=' because `$var' is not defined "
                     . "in\nthe following conditions:\n  "
                     . join ("\n  ", map { $_->human } $undef_cond->conds)
-                    . "\nEither define `$var' in these conditions,"
+                    . "\neither define `$var' in these conditions,"
                     . " or use\n`+=' in the same conditions as"
                     . " the definitions.");
            }

diff --git a/tests/distcom7.test b/tests/distcom7.test
index 500c909a5212aaac30caca80148e3b207b76161e..646275caf81c34dbe769e287ae4370c893aa8389 100755 (executable)
--- a/tests/distcom7.test
+++ b/tests/distcom7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2009, 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
@@ -38,4 +38,4 @@ echo bin_PROGRAMS = foo > subdir/Makefile.am
 
 $ACLOCAL
 AUTOMAKE_fails --add-missing subdir/Makefile
-grep 'full run' stderr
+grep 'without.*Makefile.*arguments' stderr

diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 1f1c98cfc701afc608aea7cf031bf481b91f9f04..5efe34ebb440021a33c41031a794c56b640b235b 100755 (executable)
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 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
@@ -34,10 +35,10 @@ AUTOMAKE_fails
 
 # We expect the following diagnostic:
 #
-# Makefile.am:4: Cannot apply `+=' because `INCLUDES' is not defined in
+# Makefile.am:4: cannot apply `+=' because `INCLUDES' is not defined in
 # Makefile.am:4: the following conditions:
 # Makefile.am:4:   !CHECK
-# Makefile.am:4: Either define `INCLUDES' in these conditions, or use
+# Makefile.am:4: either define `INCLUDES' in these conditions, or use
 # Makefile.am:4: `+=' in the same conditions as the definitions.
 
 # Is !CHECK mentioned?

diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 31e1c8d8d9775d3b93af88747d571d169440a9f6..b7d6643a357bf30f27dda8d8d53b615850152c7e 100755 (executable)
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -55,10 +55,10 @@ AUTOMAKE_fails
 
 # We expect the following diagnostic:
 #
-# Makefile.am:19: Cannot apply `+=' because `B' is not defined in
+# Makefile.am:19: cannot apply `+=' because `B' is not defined in
 # Makefile.am:19: the following conditions:
 # Makefile.am:19:   !COND1 and !COND3
-# Makefile.am:19: Either define `B' in these conditions, or use
+# Makefile.am:19: either define `B' in these conditions, or use
 # Makefile.am:19: `+=' in the same conditions as the definitions.
 #
 # It would be nice if Automake could print only COND3_FALSE and