($(tree-share-prefix)/mf-link-tree link-mf-tree):

separate target for making font symlinks.

diff --git a/ChangeLog b/ChangeLog
index 3cca7e5c2005b305db2f06f90e68459361a61ca6..a07a44dc4f86dadf8c15de1173a7cb3b7aa3ac07 100644 (file)
--- 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 fe136d323939991f7c234e529a2bcce1eba7bf22..1b0fabe60d941c391218d17dc4085bf2984a449d 100644 (file)
--- 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 e1dd993fff37ac5e78232da417645c413f6fcf8e..92b1f3c1f284e50def253a02ffe2395177bfc781 100644 (file)
--- 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)