From: Werner Lemberg <wl@gnu.org>
Date: Sat, 10 May 2014 09:07:31 +0000 (+0200)
Subject: mf: Set FONTFORGE environment variable while calling `mf2pt1' (#3914).
X-Git-Tag: release/2.19.6-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=20cbeb972be9f1114fa0c7686d34d4f2af12add6;p=lilypond.git

mf: Set FONTFORGE environment variable while calling `mf2pt1' (#3914).

Otherwise the script takes the first binary found in the path, regardless of
the value used while calling `configure'.
---

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 5be005a198..1db797468f 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -23,7 +23,9 @@ $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem $(outdir)/%.log
 	&& ( cd $$TMP \
 		&& ln -s ../mf2pt1.mem . \
 		&& ln -s ../../mf2pt1.mp . \
-		&& MFINPUTS=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+		&& MFINPUTS=$(abs-src-dir):..:: \
+		   FONTFORGE=$(FONTFORGE) \
+		   $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
 	&& mv $$TMP/*pfb $(outdir); \
 	rm -rf $$TMP