Fix leftover call to removed function macros_dump.

* automake.in (read_main_am_file): Call variables_dump, not
macros_dump.  Print actual error before list of variables.

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

diff --git a/ChangeLog b/ChangeLog
index d05852b21b89e7627666353227be1f8e1ecb2185..601e8574e8aaeefc77a5b00f91fbf6e856f39416 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix leftover call to removed function macros_dump.
+       * automake.in (read_main_am_file): Call variables_dump, not
+       macros_dump.  Print actual error before list of variables.
+
 2010-04-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Minor improvements in comments of test `silent3.test'.

diff --git a/automake.in b/automake.in
index 503c221309997040f62ac98a5c306874fb196963..b3a2cae05b87dc9d58e9408e8f1d8b5f3a3ce918 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6937,7 +6937,7 @@ sub read_main_am_file
     my ($amfile) = @_;
 
     # This supports the strange variable tricks we are about to play.
-    prog_error (macros_dump () . "variable defined before read_main_am_file")
+    prog_error ("variable defined before read_main_am_file\n" . variables_dump ())
       if (scalar (variables) > 0);
 
     # Generate copyright header for generated Makefile.in.