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 749f27aaee8cceffbef85586a33e274083d1654b..8917d561cd2f1c5078a0ccd0957d310217d22778 100644 (file)
--- 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 5550eaf06b49a258d8455b795d24ca65970b6d93..5e2d0cf1a759277a1ee33f5ab506814bb46aa865 100644 (file)
--- 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)