Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 85ce62d9847cf88fd2f759c2741da71d9e10bcda..423d2154ca1b22c8947623843f6ac00fde5d62a5 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -43,7 +43,7 @@ dist-changelog:
 
 default: $(outdir)/VERSION
 
-$(outdir)/VERSION: $(config_make)
+$(outdir)/VERSION: $(config_make) VERSION
        echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
@@ -100,7 +100,7 @@ local-WWW-post:
 
        cd $(top-build-dir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -type l \
-               | grep -v 'lily-[0-9].*.pdf' \
+               | grep -v 'lily-[0-9a-f]*.*pdf' \
                | grep -v '/fr/' \
                > $(outdir)/weblist
        ls $(outdir)/*.html >> $(outdir)/weblist
@@ -120,7 +120,6 @@ local-WWW-post:
                        rm -rf $$a ; \
                done \
        done
-       echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -149,7 +148,7 @@ PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
+$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION 
 # Preparing LilyPond tree for build-dir exec
        cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
        mkdir -p $(tree-bin)
@@ -213,16 +212,6 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 TAGS.make: dummy
        etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
 
-local-clean: build-dir-setup-clean local-web-clean
-
-local-web-clean:
-       rm -rf $(outdir)/web-root/
-
-
-
-build-dir-setup-clean:
-       cd $(top-build-dir) && rm -rf share
-
 $(config_h): config.hh.in
 #
 # this is to prevent people from getting