* automake.in (&do_one_merge_target): Remove, was only called from...

(&handle_merge_targets): here for `all'.
Adjust.

diff --git a/Makefile.am b/Makefile.am
index c4a7eb9d65a0173a151048833729720f305c6714..e6913a758c0e623f2567e64d1c6110a4e2af17cf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,7 +90,7 @@ maintainer-check: automake aclocal
        else :; fi
 ## We never want to use "undef", only "delete", but for $/.
        @if grep -n -w undef $(srcdir)/automake.in | \
-             fgrep -v 'undef $/' | \
+             fgrep -v 'undef $$/' | \
              grep . ; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \

diff --git a/Makefile.in b/Makefile.in
index 247a2b5e2def297af1f726da2b2003435f0c212d..d4d2bd4c517e8318574bfcd05706a26cef7f1208 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -634,7 +634,7 @@ maintainer-check: automake aclocal
          exit 1; \
        else :; fi
        @if grep -n -w undef $(srcdir)/automake.in | \
-             fgrep -v 'undef $/' | \
+             fgrep -v 'undef $$/' | \
              grep . ; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \

diff --git a/automake.in b/automake.in
index a0524223c83e0a2295352a65d67e2346d19a6287..e461f36579e12d0ca0692ca4e4d42920cdd1df8e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3999,7 +3999,7 @@ sub handle_merge_targets
       }
 
     $output_all = "all: $all_target\n";
-    &depend ('.PHONY', 'all-am', all);
+    &depend ('.PHONY', 'all-am', 'all');
 }
 
 

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index c4a7eb9d65a0173a151048833729720f305c6714..e6913a758c0e623f2567e64d1c6110a4e2af17cf 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -90,7 +90,7 @@ maintainer-check: automake aclocal
        else :; fi
 ## We never want to use "undef", only "delete", but for $/.
        @if grep -n -w undef $(srcdir)/automake.in | \
-             fgrep -v 'undef $/' | \
+             fgrep -v 'undef $$/' | \
              grep . ; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \