From 0c3ccff5943a1b5cfea65f695b87a8d2262e0f97 Mon Sep 17 00:00:00 2001
From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Fri, 12 Jun 2015 16:29:54 +0900
Subject: [PATCH] Issue 4441 / 3: Add empty lilypond-fonts.conf

This commit adds
LilyPond local fontconfig configuration file as empty.
---
 GNUmakefile.in            |  4 +++-
 mf/GNUmakefile            | 10 ++++++++--
 mf/lilypond-fonts.conf.in |  4 ++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 mf/lilypond-fonts.conf.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 74f2551393..749f27aaee 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -253,12 +253,14 @@ $(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/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)/fonts.conf . && \
+		ln -s ../../../../../mf/$(outconfbase)/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 646234cd07..5550eaf06b 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -50,6 +50,8 @@ COUR_OTFS = $(addprefix $(outdir)/,NimbusMonL-ReguObli.otf \
 				   NimbusMonL-Regu.otf \
 				   NimbusMonL-Bold.otf)
 
+LILYPOND_FONTS_CONF = $(outdir)/lilypond-fonts.conf
+
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
 ENC_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.enc)
@@ -88,14 +90,15 @@ ALL_GEN_FILES = $(ENC_FILES) \
 		$(COUR_OTFS) \
 		$(OTF_FILES) \
 		$(SVG_FILES) \
-		$(WOFF_FILES)
+		$(WOFF_FILES) \
+		$(LILYPOND_FONTS_CONF)
 
 # PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
 INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source
 INSTALLATION_FILES = $(MF_FILES)
 
-INSTALLATION_OUT_SUFFIXES = 1 2
+INSTALLATION_OUT_SUFFIXES = 1 2 3
 
 INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf
 INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
@@ -104,6 +107,9 @@ INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
 INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
 INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES)
 
+INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts
+INSTALLATION_OUT_FILES3 = $(LILYPOND_FONTS_CONF)
+
 export MFINPUTS := .:$(MFINPUTS)
 
 # A few rules here generate multiple files from one command line.  For
diff --git a/mf/lilypond-fonts.conf.in b/mf/lilypond-fonts.conf.in
new file mode 100644
index 0000000000..43e52c8578
--- /dev/null
+++ b/mf/lilypond-fonts.conf.in
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+</fontconfig>
-- 
2.39.5