From 45f01dfbac053d55371060f9b79656647a879d52 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 26 Aug 2000 20:37:13 +0000
Subject: [PATCH] 	* subdirs.am (maintainer-clean-recursive): Always run
 clean rules 	in `.' after all subdirs.  Fixes PR automake/3 and PR
 automake/24.

---
 ChangeLog         |  3 +++
 lib/am/subdirs.am | 11 +++++------
 subdirs.am        | 11 +++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6abad8f..9e14125c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-26  Tom Tromey  <tromey@cygnus.com>
 
+	* subdirs.am (maintainer-clean-recursive): Always run clean rules
+	in `.' after all subdirs.  Fixes PR automake/3 and PR automake/24.
+
 	* automake.in (handle_man_pages): Generate install targets for man
 	even if man_MANS not defined.  From `danpb'.  Fixes PR automake/73.
 
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index b0ce04ac..3149ead7 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -56,13 +56,12 @@ maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-## FreeBSD make/sh will exit if the test fails and we use "&&";
-## hence the `if'.
-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-## If we haven't seen `.', then add it at the beginning.
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+## Always do `.' last.
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
diff --git a/subdirs.am b/subdirs.am
index b0ce04ac..3149ead7 100644
--- a/subdirs.am
+++ b/subdirs.am
@@ -56,13 +56,12 @@ maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-## FreeBSD make/sh will exit if the test fails and we use "&&";
-## hence the `if'.
-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-## If we haven't seen `.', then add it at the beginning.
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+## Always do `.' last.
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
-- 
2.43.5