From: Akim Demaille <akim@epita.fr>
Date: Mon, 5 Mar 2001 14:49:43 +0000 (+0000)
Subject: * automake.in (&do_one_merge_target): Remove, was only called from...
X-Git-Tag: handle-languages~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7858570eb29b5d6da324801916e728e4541dec08;p=thirdparty%2Fautomake.git

* automake.in (&do_one_merge_target): Remove, was only called from...
(&handle_merge_targets): here for `all'.
Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index 477999f4e..94db73fd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (&do_one_merge_target): Remove, was only called from...
+	(&handle_merge_targets): here for `all'.
+	Adjust.
+
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
 	Make the installation/uninstallation of Info pages follow the
diff --git a/Makefile.am b/Makefile.am
index c4a7eb9d6..e6913a758 100644
--- 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 247a2b5e2..d4d2bd4c5 100644
--- 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 a0524223c..e461f3657 100755
--- 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 c4a7eb9d6..e6913a758 100644
--- 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; \