X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=00345e39dc760f509f46524d42e724aed8d9697f;hb=ece8e196440187c2eef4b1c0e6bdae29cd2695ca;hp=c9879725c8b6504c1237dea72e1fb82a98f7e7e1;hpb=46f29bab40e008c63440ae17f47661cf04f41202;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c9879725c8..00345e39dc 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -99,6 +99,7 @@ local-WWW-post:
 	rm -rf $(outdir)/online-root
 	rm -rf $(outdir)/offline-root
 	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
+	find $(outdir)/offline-root -type l -delete
 
 
 tree-prefix = $(outdir)
@@ -161,13 +162,12 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 	cd $(tree-share-prefix)/tex && \
 		ln -s $(top-src-dir)/tex source && \
 		ln -s ../../../../../tex/$(outconfbase) tex-out && \
-		ln -s ../../../../../mf/$(outconfbase) mf-out
-
+		true
 	cd $(tree-share-prefix)/fonts && \
 		ln -s $(top-src-dir)/mf source && \
 		true
 	-cd $(tree-share-prefix)/elisp && \
-		ln -sf ../../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
+		ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
 		ln -s $(top-src-dir)/elisp/*.el .
 	$(foreach i,$(CATALOGS), \
 		(mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \
@@ -178,10 +178,13 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
 	-rm -f $(tree-share-prefix)/fonts/otf/* &&  \
 	rm -f $(tree-share-prefix)/fonts/svg/* &&  \
+	rm -f $(tree-share-prefix)/fonts/fonts.conf &&  \
 	rm -f $(tree-share-prefix)/fonts/tfm/* &&  \
 	rm -f $(tree-share-prefix)/fonts/type1/* &&  \
 		cd $(tree-share-prefix)/fonts/otf && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.otf .
+	-cd $(tree-share-prefix)/fonts/ && \
+		ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
 	-cd $(tree-share-prefix)/fonts/svg && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.svg .
 	-cd $(tree-share-prefix)/fonts/tfm && \
@@ -226,7 +229,7 @@ test:
 	fi > input/regression/out-test/tree.gittxt
 	$(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html
 	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
-
+	rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(outdir)/share input/regression/out-test/
 
 test-baseline: 
 	@if  test -d .git ; then \