From c3d47d57a548aab53e7627ce8eb81205b35a2245 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 25 Apr 2010 17:19:13 +0200 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ automake.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d05852b21..601e8574e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-25 Ralf Wildenhues + + 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 Minor improvements in comments of test `silent3.test'. diff --git a/automake.in b/automake.in index 503c22130..b3a2cae05 100755 --- 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. -- 2.47.2