release: 1.2.7

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

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 3ca5d629f1e9b1ae6854d5c9fe9316bbebd69a45..327e1e9207e080ef58f02691d715bb1e1d144a9f 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -15,6 +15,11 @@ clean: localclean
        -rm -f $(outdir)/*
        $(LOOP)
 
+ifneq ($(strip $(depth)),.)
+dist:
+       make -C $(depth) dist
+endif
+
 distclean: clean 
        $(LOOP)
        $(MAKE) local-distclean
@@ -48,12 +53,13 @@ help: generic-help local-help
   config      rerun configure\n\
   deb         build Debian package\n\
   default     same as the empty target\n\
-  diff        generate patch: $(package)-$(TOPLEVEL_VERSION).diff.gz\n\
+  diff        generate patch: $(depth)/$(outdir)/$(distname).diff.gz\n\
   .           Options:\n\
   .             from=0.1.74\n\
   .             help==\n\
   .             release==\n\
   .             to=0.1.74.jcn2\n\
+  dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
   distclean   cleaner than clean (duh)\n\
   doc         update all documentation\n\
   doc++       make doc++ documentation\n\
@@ -63,6 +69,8 @@ help: generic-help local-help
   lib         update all libraries\n\
   release     roll tarball and generate patch\n\
   rpm         build RedHat package\n\
+  po          make new po database\n\
+  po-update   update po database\n\
   tar         same as dist\n\
   TAGS        genarate tagfiles\n\
   zip         build binary doze distribution\n\
@@ -84,13 +92,10 @@ doc++:
        (cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
 
 
-
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
        mkdir -p $(distdir)/$(localdir)
        $(LN) $(DIST_FILES) $(distdir)/$(localdir)
 
-#UGH UGH . make ifdef doesn't mix with string substitution semantics (late expansion vs. early expansion)
-# 
        case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
                $(LN) $(NON_ESSENTIAL_DIST_FILES) $(distdir)/$(localdir);; \
        esac
@@ -99,7 +104,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
 
 
 
@@ -118,11 +125,11 @@ $(outdir)/VERSION: $(depth)/VERSION
        cp $< $@
 
 $(outdir)/version.hh: $(outdir)/VERSION
-       sh ./$(step-bindir)/make-version.sh $< > $@
+       $(PYTHON) $(step-bindir)/make-version.py $< > $@
 
 # should this be in Rules?
 configure: configure.in aclocal.m4
-       autoconf - < $<> $@
+       autoconf 
        chmod +x configure
 
 localclean: