* 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 c8df9d22ad3bcd42a88d700cefc928dc5962e15a..ce9886ba9389d321bda6ba07d328d98c281961fb 100644 (file)
--- 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 64e4c264d1eb3f8e1aa06ab3fd271fd9a1c3258d..88a12c4db0a289248065891e043d51d0a4ed0a0a 100644 (file)
--- 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 bed724a4664a2fa05381f16331ba0a8f2f1b00da..0c0d22e67a245ad287059c667793fd762f107c50 100755 (executable)
--- 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