From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 2 Jul 2003 23:15:52 +0000 (+0000)
Subject: * automake.in (handle_single_transform_list): Use $var->name
X-Git-Tag: Release-1-7b~139
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=864a7b0039c8099c999f95b6803c5e9d482003b9;p=automake.git

* 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 1422fe9d..5032efc7 100644
--- 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 583fad20..a8142eb3 100755
--- 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