* subdirs.am (maintainer-clean-recursive): Always run clean rules

	in `.' after all subdirs.  Fixes PR automake/3 and PR automake/24.

diff --git a/ChangeLog b/ChangeLog
index e6abad8fd191de0005738358ff9ccbeecb4777ef..9e14125c06c4b8edc9ba416699fbbe17b073169b 100644 (file)
--- 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 b0ce04ac0488bd58c00980665b5f272d19f92588..3149ead756a2da1f4b64f7eae8445d2a8081d9fe 100644 (file)
--- 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 b0ce04ac0488bd58c00980665b5f272d19f92588..3149ead756a2da1f4b64f7eae8445d2a8081d9fe 100644 (file)
--- 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"; \