From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Sat, 8 Aug 2015 12:15:37 +0000 (+0900)
Subject: Issue 4544 / 3: Fix makefiles for LilyPond local fontconfig conf file dividing
X-Git-Tag: release/2.19.26-1~51
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=ebd5a4af248c95178abb8490a32c0b8d3af4e1d7

Issue 4544 / 3: Fix makefiles for LilyPond local fontconfig conf file dividing

This commit fixes LilyPond local fontconfig conf file dividing.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 749f27aaee..8917d561cd 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -253,14 +253,16 @@ $(tree-share-prefix)/mf-link-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/lilypond-fonts.conf &&  \
+	rm -f $(tree-share-prefix)/fonts/00-lilypond-fonts.conf &&  \
+	rm -f $(tree-share-prefix)/fonts/99-lilypond-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 . && \
-		ln -s ../../../../../mf/$(outconfbase)/lilypond-fonts.conf .
+		ln -s ../../../../../mf/$(outconfbase)/00-lilypond-fonts.conf . && \
+		ln -s ../../../../../mf/$(outconfbase)/99-lilypond-fonts.conf .
 	-cd $(tree-share-prefix)/fonts/svg && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.svg .
 	-cd $(tree-share-prefix)/fonts/svg && \
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 5550eaf06b..5e2d0cf1a7 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -50,7 +50,8 @@ COUR_OTFS = $(addprefix $(outdir)/,NimbusMonL-ReguObli.otf \
 				   NimbusMonL-Regu.otf \
 				   NimbusMonL-Bold.otf)
 
-LILYPOND_FONTS_CONF = $(outdir)/lilypond-fonts.conf
+LILYPOND_FONTS_CONF = $(outdir)/00-lilypond-fonts.conf \
+		      $(outdir)/99-lilypond-fonts.conf
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)