Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ec900d6f97dd041247999a386f22afcb7cb950fc..52e4a1b3142aabca6d69b4aba281bb337f56e685 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,7 +22,7 @@ TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
-EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \
+EXTRA_DIST_FILES = VERSION .gitignore SConstruct \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -85,7 +85,7 @@ local-WWW-post:
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
        find $(outdir) -name '*-root' | xargs rm -rf
        $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
-       find $(foreach t, $(WEB_TARGETS), $(outdir)/$(t)-root) -type l -delete
+       find $(outdir)/offline-root -type l -delete
 
 
 tree-prefix = $(outdir)
@@ -176,7 +176,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
        -cd $(tree-share-prefix)/fonts/tfm && \
                ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
        -cd $(tree-share-prefix)/fonts/type1 && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
+               ln -s ../../../../../../mf/$(outconfbase)/*.pf? .
 
 TAGS.make: dummy
        etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
@@ -214,8 +214,8 @@ test-baseline:
        fi
        $(MAKE) 
        $(MAKE) test
-       $(MAKE) -C input/regression/ local-test-baseline
-       $(MAKE) -C input/regression/musicxml local-test-baseline
+       $(MAKE) out=test -C input/regression/ local-test-baseline
+       $(MAKE) out=test -C input/regression/musicxml local-test-baseline
 
 local-check: test
        rm -rf $(RESULT_DIR)