X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=fb0265a36e9db80362aa45aee927b31d27ffeb65;hb=e286595eda5434a6f03db2ebdc0d6db975c32003;hp=219af763fde698207f3b7a2adcc771124cab9acb;hpb=6fab9d28204f1fad82aa884d3ba3d172ec5e4256;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 219af763fd..fb0265a36e 100644
--- 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
@@ -32,12 +32,6 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-#
-# suggested settings
-#
-# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
-# 
-include local.make
 
 local-dist: dist-toplevel-txt-files 
 
@@ -60,6 +54,7 @@ install-WWW:
 	rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
 	$(MAKE) -C Documentation/user local-install-WWW
 	$(MAKE) -C Documentation/user install-info
+	$(MAKE) -C input/lsr install-info
 
 install-help2man:
 	$(MAKE) -C scripts man install-help2man
@@ -91,7 +86,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)
@@ -182,7 +177,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')
@@ -215,13 +210,13 @@ test:
 	$(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
-	@if  test -d .git ; then \
+	@if test -d .git ; then \
 		$(if $(shell git diff), echo "commit before base lining" && false,true) ; \
 	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)
@@ -239,3 +234,4 @@ test-redo:
 
 test-clean:
 	$(MAKE) -C input/regression/ out=test clean
+