From 5921ddf0fc722073cc2c8435dbbc8c863729202c Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 19 Dec 2005 23:36:57 +0000
Subject: [PATCH] ($(tree-share-prefix)/mf-link-tree link-mf-tree): separate
 target for making font symlinks.

---
 ChangeLog      |  3 +++
 GNUmakefile.in | 22 +++++++++++++---------
 mf/GNUmakefile |  6 +++---
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cca7e5c20..a07a44dc4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* GNUmakefile.in ($(tree-share-prefix)/mf-link-tree link-mf-tree):
+	separate target for making font symlinks.
+
 	* stepmake/stepmake/help2man-vars.make (OUT_DIST_FILES): only do
 	something if DOCUMENTATION is no.
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index fe136d3239..1b0fabe60d 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -146,14 +146,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 		ln -s $(top-src-dir)/tex source && \
 		ln -s ../../../../../tex/$(outconfbase) tex-out && \
 		ln -s ../../../../../mf/$(outconfbase) mf-out
-	-cd $(tree-share-prefix)/fonts/otf && \
-		ln -s ../../../../../../mf/$(outconfbase)/*.otf .
-	-cd $(tree-share-prefix)/fonts/svg && \
-		ln -s ../../../../../../mf/$(outconfbase)/*.svg .
-	-cd $(tree-share-prefix)/fonts/tfm && \
-		ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
-	-cd $(tree-share-prefix)/fonts/type1 && \
-		ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
+
 	cd $(tree-share-prefix)/fonts && \
 		ln -s $(top-src-dir)/mf source && \
 		true
@@ -164,9 +157,20 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 		(mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \
 		cd $(tree-share)/locale/$i/LC_MESSAGES && \
 		ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&) true
-#	touch $@
 	touch $(tree-share-prefix)/lilypond-force
 
+$(tree-share-prefix)/mf-link-tree link-mf-tree:
+	-rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* &&  \
+		cd $(tree-share-prefix)/fonts/otf && \
+		ln -s ../../../../../../mf/$(outconfbase)/*.otf .
+	-cd $(tree-share-prefix)/fonts/svg && \
+		ln -s ../../../../../../mf/$(outconfbase)/*.svg .
+	-cd $(tree-share-prefix)/fonts/tfm && \
+		ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
+	-cd $(tree-share-prefix)/fonts/type1 && \
+		ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
+
+
 local-clean: build-dir-setup-clean
 build-dir-setup-clean:
 	cd $(top-build-dir) && rm -rf share
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index e1dd993fff..92b1f3c1f2 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -169,10 +169,10 @@ INSTALLATION_OUT_FILES9=$(SVG_FILES)
 export MFINPUTS:=.:$(MFINPUTS)
 
 .PHONY: tree-regen
+
 # FIXME: temporary hack: must regenerate after building fonts
 tree-regen:
-	rm -rf $(top-build-dir)/share
-	${MAKE} -C $(top-build-dir) link-tree
+	${MAKE} -C $(top-build-dir) link-mf-tree
 
 default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
 
@@ -245,4 +245,4 @@ local-uninstall:
 	-rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
 
 foe:
-	@echo mf:$(FETA_MF_FILES)
\ No newline at end of file
+	@echo mf:$(FETA_MF_FILES)
-- 
2.39.5