Hi,

Attached is a patch that modifies `make distclean' so that it behaves
correctly.

I've thoroughly tested it, though I've never modified any of the
makefiles before, so I'm naturally a little hesitant about it.

Okay to apply?


Thanks,
Patrick
>From 9adf95e3566d4e3e14a59c412541d106cf020309 Mon Sep 17 00:00:00 2001
From: Patrick McCarty <[email protected]>
Date: Sun, 30 Aug 2009 15:52:53 -0700
Subject: [PATCH] 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.
---
 stepmake/stepmake/generic-targets.make  |    5 ++---
 stepmake/stepmake/toplevel-targets.make |    1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stepmake/stepmake/generic-targets.make 
b/stepmake/stepmake/generic-targets.make
index b98eb8c..eddf25a 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 17f0c59..1c590b0 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
-- 
1.6.4.1

_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to