From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Mon, 10 Aug 2015 01:47:49 +0000 (+0900)
Subject: Issue 4552 / 2: Add makefiles to install TeX Gyre font OTF files
X-Git-Tag: release/2.19.26-1~29
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7c30014f110ee407b56c91d3b451b28ce7a89f8a;p=lilypond.git

Issue 4552 / 2: Add makefiles to install TeX Gyre font OTF files

This commit adds makefiles
to install TeX Gyre font OTF files.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8917d561cd..abc7ecaf6a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -258,7 +258,9 @@ $(tree-share-prefix)/mf-link-tree: $(tree-share-prefix)/lilypond-force
 	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 .
+		ln -s ../../../../../../mf/$(outconfbase)/*.otf . && \
+		$(foreach i,$(addprefix $(TEXGYRE_DIR)/,$(TEXGYRE_FILES)), \
+			ln -s $i . && ) true
 	-cd $(tree-share-prefix)/fonts && \
 		ln -s ../../../../../mf/$(outconfbase)/fonts.conf . && \
 		ln -s ../../../../../mf/$(outconfbase)/00-lilypond-fonts.conf . && \
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 5e2d0cf1a7..2cddd187e1 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -50,6 +50,8 @@ COUR_OTFS = $(addprefix $(outdir)/,NimbusMonL-ReguObli.otf \
 				   NimbusMonL-Regu.otf \
 				   NimbusMonL-Bold.otf)
 
+TEXGYRE_OTFS = $(addprefix $(TEXGYRE_DIR)/,$(TEXGYRE_FILES))
+
 LILYPOND_FONTS_CONF = $(outdir)/00-lilypond-fonts.conf \
 		      $(outdir)/99-lilypond-fonts.conf
 
@@ -103,7 +105,7 @@ INSTALLATION_OUT_SUFFIXES = 1 2 3
 
 INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf
 INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
-			  $(NCSB_OTFS) $(HELV_OTFS) $(COUR_OTFS)
+			  $(NCSB_OTFS) $(HELV_OTFS) $(COUR_OTFS) $(TEXGYRE_OTFS)
 
 INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
 INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES)