X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=6d81f550ac89892ba86107e4054dd13d72160cc6;hb=45a78dfa12df96f7271de565c3d9ad8da7ccc065;hp=3a7b158aead63d394491bc66adf6813a6d6dee5e;hpb=38d7d319eabc906e82fb42002678c6d42a23b6f7;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 3a7b158aea..6d81f550ac 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -15,13 +15,22 @@ $(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
 
+# since recent mpost versions no longer create a mem file, we create a dummy
+# file to satisfy the dependency (which gets overwritten in case an older
+# mpost creates a real mem file)
 $(outdir)/mf2pt1.mem: mf2pt1.mp
-	cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump
+	cd $(outdir) \
+	   && touch mf2pt1.mem \
+	   && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump