(option_parser): update to 2.7.40

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 773f1917669d5c744eebc8e3e4c93aa1ba507e07..5f28601d9f6205c54fac9ef0bcbade0cbab1b348 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -30,7 +30,7 @@ INSTALLATION_FILES=$(config_make) VERSION
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES=toplevel po install
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 doc: 
        $(MAKE) -C Documentation
@@ -60,7 +60,9 @@ final-install:
 web-ext = html midi pdf png txt ly
 
 footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
-footifymail = MAILADDRESS=bug-lilypond@gnu.org
+footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
+
+
 
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
@@ -83,16 +85,20 @@ local-WWW-post:
                tar -C $(outdir)/web-root/ -xf -  
        cd $(outdir)/web-root/ &&  \
                for a in `find . -name out-www`; do \
-                       mv $$a/* $$a/.. ; \
-                       rmdir $$a ; \
+                       rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
+                       rm -rf $$a ; \
                done
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
 tree-lib = $(tree-prefix)/lib
 tree-share = $(tree-prefix)/share
-tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
-tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
+tree-share-prefix = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/current
+
+C_DIRS = flower lily
+c-clean:
+       $(foreach i, $(C_DIRS), $(MAKE) -C $(i) clean &&) true
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
@@ -114,8 +120,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        mkdir -p $(tree-bin)
        mkdir -p $(tree-share-prefix)
        mkdir -p $(tree-lib-prefix)
-       (cd $(tree-lib)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
-       (cd $(tree-share)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
        mkdir -p $(tree-share-prefix)/dvips
        mkdir -p $(tree-share-prefix)/elisp
        mkdir -p $(tree-share-prefix)/fonts
@@ -160,10 +164,10 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
                ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&) true
        touch $(tree-share-prefix)/lilypond-force
 
-$(tree-share-prefix)/mf-link-tree link-mf-tree:
+$(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
        -rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.otf .
+               ln -s ../../../../../../mf/$(outconfbase)/*.{otf,ttf} .
        -cd $(tree-share-prefix)/fonts/svg && \
                ln -s ../../../../../../mf/$(outconfbase)/*.svg .
        -cd $(tree-share-prefix)/fonts/tfm && \
@@ -172,6 +176,9 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree:
                ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
 
 
+TAGS.make: dummy
+       etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
+
 local-clean: build-dir-setup-clean
 build-dir-setup-clean:
        cd $(top-build-dir) && rm -rf share