From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Mon, 17 Nov 2003 19:08:30 +0000 (+0000)
Subject: * lib/Automake/Rule.pm (define): Suggest using target-local instead
X-Git-Tag: Release-1-7d~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5167e179c0676a503b3ed52eed3fbf94a7094912;p=thirdparty%2Fautomake.git

* lib/Automake/Rule.pm (define): Suggest using target-local instead
of target-am, not target-am-local.
* tests/overrid.test: Check the diagnostic for clean-am.
Report from Bruno Haible.
---

diff --git a/ChangeLog b/ChangeLog
index c8df9d22a..ce9886ba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-17  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* lib/Automake/Rule.pm (define): Suggest using target-local instead
+	of target-am, not target-am-local.
+	* tests/overrid.test: Check the diagnostic for clean-am.
+	Report from Bruno Haible.
+
 2003-11-17  Jim Meyering  <jim@meyering.net>
 
 	* bootstrap: Require not only that `perl' have the executable
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 64e4c264d..88a12c4db 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -663,7 +663,7 @@ sub define ($$$$$)
 	      $noam =~ s/-am$//;
 	      if (exists $dependencies{"$noam-am"})
 		{
-		  $hint = "consider using $target-local instead of $target";
+		  $hint = "consider using $noam-local instead of $target";
 		}
 
 	      msg_cond_rule ('override', $cond, $target,
diff --git a/tests/overrid.test b/tests/overrid.test
index bed724a46..0c0d22e67 100755
--- a/tests/overrid.test
+++ b/tests/overrid.test
@@ -36,6 +36,8 @@ installcheck:
 	:
 html:
 	:
+clean-am:
+	:
 
 if COND
 ps: mine
@@ -49,6 +51,9 @@ AUTOMAKE_fails
 grep install-local stderr && exit 1 # There is no such thing as install-local
 grep installcheck-local stderr
 grep html-local stderr
+# Make sure overriding *-am targets suggest using *-local, not *-am.
+grep cleam-am-local stderr && exit 1
+grep clean-local stderr
 
 # Conditional overrides ought to be diagnosed, but it can't be done yet.
 # See the FIXME in rule_define.   Once this is fixed, the grep below