From: Werner Lemberg <wl@gnu.org>
Date: Tue, 28 Jun 2011 06:11:19 +0000 (+0200)
Subject: Make lilypond's way of calling mf2pt1 work again with recent mpost versions.
X-Git-Tag: release/2.14.2-1~29
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8b636449b845e1b329a5b7dfa7de69d1b9dadf5e;p=lilypond.git

Make lilypond's way of calling mf2pt1 work again with recent mpost versions.
---

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 3a7b158aea..c1728f9924 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -15,10 +15,14 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
 
 # ugh . mf2pt1 is extremely broken, it pollutes CWD iso. creating a
 # temp dir.
+#
+# the soft link for mf2pt1.mp is for recent mpost versions
+# which no longer dump a .mem file
 $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
 	TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \
 	&& ( cd $$TMP \
 		&& ln -s ../mf2pt1.mem . \
+		&& ln -s ../../mf2pt1.mp . \
 		&& MFINPUTS=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
 	&& mv $$TMP/*pfb $(outdir); \
 	rm -rf $$TMP