X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=1db797468fbcd034afc444970f5de8386d9ac406;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=ab28ced9a5f3d8f0319580acb309d0012662d914;hpb=97047e999fd00f4981bad49eb4a45f6952bfd1e3;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index ab28ced9a5..1db797468f 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -2,26 +2,37 @@
 
 # we want to see botched results as well.
 $(outdir)/%.dvi: %.mf
-	-MFINPUTS=$(src-dir) $(METAFONT) "\scrollmode; input $<;"
+	-$(DO_MF_DEP) MFINPUTS=$(src-dir) $(METAFONT) "\scrollmode; input $<;"
 	gftodvi $(basename $<)
 	mv $(basename $<).dvi $(outdir)
 	rm $(basename $<).*gf
 
 $(outdir)/%.tfm $(outdir)/%.log: %.mf
-	MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;" $(METAFONT_QUIET)
+	$(DO_MF_DEP) MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;" $(METAFONT_QUIET)
 # Let's keep this log output, it saves another mf run.
 	mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)
 	rm -f $(basename $(@F)).*gf  $(basename $(@F)).*pk
 
 # ugh . mf2pt1 is extremely broken, it pollutes CWD iso. creating a
 # temp dir.
-$(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
-	TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \
+#
+# the soft link for mf2pt1.mp is for recent mpost versions
+# which no longer dump a .mem file
+$(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem $(outdir)/%.log
+	$(DO_MF_DEP) TMP=`mktemp -d $(outdir)/pfbtemp.$*.XXXXXXXXX` \
 	&& ( cd $$TMP \
 		&& ln -s ../mf2pt1.mem . \
-		&& MFINPUTS=$(top-src-dir)/mf:..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+		&& ln -s ../../mf2pt1.mp . \
+		&& MFINPUTS=$(abs-src-dir):..:: \
+		   FONTFORGE=$(FONTFORGE) \
+		   $(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