From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 30 Dec 2006 19:55:23 +0000 (+0100)
Subject: don't install .tfm fonts. Fix typo in MF rule.
X-Git-Tag: release/2.10.7-1~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6ded384c666072a001a7ee357735dc531e0eac24;p=lilypond.git

don't install .tfm fonts. Fix typo in MF rule.

Conflicts:

	mf/GNUmakefile
---

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 84cd5065d3..1492d1790b 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -99,8 +99,7 @@ PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
 
 # Make tfm files first, log files last,
 # so that normally log files aren't made twice
-
-ALL_GEN_FILES= $(TFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) 
+ALL_GEN_FILES=$(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) 
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
@@ -112,9 +111,6 @@ INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6
 INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf
 INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_OTFS)
 
-INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
-INSTALLATION_OUT_FILES3=$(TFM_FILES)
-
 INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg
 INSTALLATION_OUT_FILES4=$(SVG_FILES)
 
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 6ed6a2f7cb..b33bd10be6 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -7,7 +7,7 @@ $(outdir)/%.dvi: %.mf
 	mv $(basename $<).dvi $(outdir)
 	rm $(basename $<).*gf
 
-$(outdir)/%.tfm $(outdir)%.log: %.mf
+$(outdir)/%.tfm $(outdir)/%.log: %.mf
 	MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
 # Let's keep this log output, it saves another mf run.
 	mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)