* automake.in (handle_single_transform_list): Use $var->name

to print variable in the configure-substitution diagnostic.
Do not mention the parent when it is the variable itself.

diff --git a/ChangeLog b/ChangeLog
index 1422fe9d0406fefae8a50fb55097da94bd3aa2c6..5032efc79ee55a0b214368dd991783fdc2da2181 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-07-03  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * automake.in (handle_single_transform_list): Use $var->name
+       to print variable in the configure-substitution diagnostic.
+       Do not mention the parent when it is the variable itself.
+
        * tests/package.test: Delete.
        * tests/Makefile.am (TESTS): Remove package.test.
 

diff --git a/automake.in b/automake.in
index 583fad20ba190654f617ff0f6f13ff3531408d13..a8142eb34c1d9c180d15cc77e74e10a9a14bc230 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1894,11 +1894,14 @@ sub handle_single_transform_list ($$$$@)
         # Configure substitutions in _SOURCES variables are errors.
         if (/^\@.*\@$/)
         {
-            err_var ($var,
-                    "`$var' includes configure substitution `$_', and is " .
-                    "referred to\nfrom `$topparent': configure " .
-                    "substitutions are not allowed\nin _SOURCES variables");
-            next;
+         my $parent_msg = '';
+         $parent_msg = "\nand is referred to from `$topparent'"
+           if $topparent ne $var->name;
+         err_var ($var,
+                  "`" . $var->name . "' includes configure substitution `$_'"
+                  . $parent_msg . ";\nconfigure " .
+                  "substitutions are not allowed in _SOURCES variables");
+         next;
         }
 
         # If the source file is in a subdirectory then the `.o' is put