From: Patrick McCarty <pnorcks@gmail.com>
Date: Sun, 30 Aug 2009 22:52:53 +0000 (-0700)
Subject: Improve behavior of `make distclean'
X-Git-Tag: release/2.13.4-1~104
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b59f0a13fb4e68f8ab5eecb02f56a6090c4c86b9;p=lilypond.git

Improve behavior of `make distclean'

This target is supposed to perform a `make clean', and then remove the
appropriate parts of configure output.

Thus, $(LOOP) should be removed, since configure output only appears in
the top-src-dir, and $(outdir) should be removed afterwards.

The other two changes are just nitpicks: the quotes are not needed, and
$(outdir) already expands to ./out, so the extra ./ is superfluous.
---

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index b98eb8c8c3..eddf25a671 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -8,12 +8,12 @@ man:
 	$(LOOP)
 
 clean: local-clean
-	-rm -rf "./$(outdir)"
+	-rm -rf $(outdir)
 	$(LOOP)
 
 ifeq (,$(findstring metafont,$(STEPMAKE_TEMPLATES)))
 bin-clean: local-bin-clean
-	-rm -rf "./$(outdir)"
+	-rm -rf $(outdir)
 	$(LOOP)
 else
 bin-clean:
@@ -27,7 +27,6 @@ dist:
 endif
 
 distclean: clean
-	$(LOOP)
 	$(MAKE) local-distclean
 
 cvs-clean:
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 17f0c59245..1c590b0447 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -9,6 +9,7 @@ local-distclean:
 		config.cache config.status config.log index.html \
 		stepmake/stepmake/stepmake stepmake/stepmake/bin
 	rm -rf autom4te.cache
+	rm -rf $(outdir)
 
 local-maintainerclean:
 	rm -f configure