Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / stepmake / stepmake / generic-targets.make

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 75194985a3872cd1a6cccad5b726a15c136ca53f..ea288ca58c13a37693247fc2b1422d3af0a4684f 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -14,14 +14,20 @@ clean: local-clean
 
 ifneq ($(strip $(depth)),.)
 dist:
-       make -C $(depth) dist
+       $(MAKE) -C $(depth) dist
 endif
 
-distclean: clean 
+distclean: clean
        $(LOOP)
        $(MAKE) local-distclean
 
-maintainerclean: 
+cvs-clean:
+       $(MAKE) local-distclean
+       find . -type d -name out | xargs rm -rf
+       find . -type d -name out-www | xargs rm -rf
+       rm -f aclocal.m4 configure
+
+maintainerclean:
        $(LOOP)
        $(MAKE) local-maintainerclean
        $(MAKE) local-distclean
@@ -72,13 +78,10 @@ local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
        case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
                $(LN) $(NON_ESSENTIAL_DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir);; \
        esac
-
        case "$(OUT_DIST_FILES)x" in x) ;; *) \
                mkdir -p $(distdir)/$(localdir)/$(outdir); \
                $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/$(outdir);; \
        esac
-#      $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
-# absolute for installed stepmake
        $(foreach i, $(SUBDIRS), $(MAKE) top-src-dir=$(top-src-dir) distdir=$(distdir) localdir=$(localdir)/$(notdir $(i)) -C $(i) local-dist &&) true
 
 
@@ -115,7 +118,7 @@ local-distclean:
 local-maintainerclean:
 
 install-strip:
-       $(MAKE) INSTALL="$(INSTALL) -s" install
+       $(MAKE) INSTALLPY="$(INSTALLPY) -s" install
 
 ifeq ($(strip $(depth)),.)
 final-install:
@@ -135,9 +138,8 @@ uninstall: local-uninstall
 local-uninstall:
 
 installextradoc:
-       -$(INSTALL) -d $(DESTDIR)$(prefix)/doc/$(package)
-       $(foreach i, $(EXTRA_DOC_FILES),\
-               cp -r $(i) $(prefix)/doc/$(package) &&) true
+       -$(INSTALLPY) -d $(DESTDIR)$(prefix)/doc/$(package)
+       cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package)
 
 include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
 
@@ -168,7 +170,7 @@ diff:
        $(PYTHON) $(step-bindir)/package-diff.py  --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir) $(makeflags)
        -ln -f $(depth)/$(outdir)/$(distname).diff.gz $(patch-dir)
 
-release: 
+release:
        $(PYTHON) $(step-bindir)/release.py --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir)
 
 
@@ -184,6 +186,6 @@ WWW: local-WWW
 WWW-post: local-WWW-post
        $(LOOP)
 
-web: 
+web:
        $(MAKE) out=www WWW
        $(MAKE) out=www WWW-post