release: 1.1.0

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

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index cfade84d8924e4b1ed585b90d0895149e233ec48..1d368b0a4b5386d04c03a7b152760d2c523abbaf 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -3,7 +3,7 @@
 
 .PHONY : all clean config default dist doc doc++  exe help html lib TAGS\
         po
-VPATH=$(outdir)/               #ugh?
+# VPATH=$(outdir)/             #ugh?
 # target all:
 #
 all:    default
@@ -84,14 +84,11 @@ doc++:
        (cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
 
 
-update-state-vector:
-ifneq ($(strip $(state-vector)),)
-       if [ "`tail -1 $(state-vector)`" != "$(TOPLEVEL_VERSION)" ]; then\
-         echo $(TOPLEVEL_VERSION) >> $(state-vector); \
-       fi
-endif
 
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
+#      echo topdir=$(topdir)
+#      echo distdir=$(distdir)
+#      echo locladir=$(localdir)
        mkdir -p $(distdir)/$(localdir)
        $(LN) $(DIST_FILES) $(distdir)/$(localdir)
 
@@ -105,7 +102,9 @@ local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
                mkdir $(distdir)/$(localdir)/out; \
                $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/out;; \
        esac
-       $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
+#      $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
+# absolute for installed stepmake
+       $(foreach i, $(SUBDIRS), $(MAKE) topdir=$(topdir) distdir=$(distdir) localdir=$(localdir)/$(notdir $(i)) -C $(i) local-dist &&) true
 
 
 
@@ -123,8 +122,8 @@ TAGS:
 $(outdir)/VERSION: $(depth)/VERSION
        cp $< $@
 
-$(outdir)/version.hh: VERSION
-       sh ./$(step-bindir)/make-version.sh $< > $@
+$(outdir)/version.hh: $(outdir)/VERSION
+       sh $(step-bindir)/make-version.sh $< > $@
 
 # should this be in Rules?
 configure: configure.in aclocal.m4
@@ -158,6 +157,8 @@ installextradoc:
 WWW: local-WWW
        $(LOOP)
 
+local-WWW:
+
 include $(stepdir)/package.make
 
 include $(outdir)/dummy.dep $(DEP_FILES)