X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=45ff320f467d31262a28f36d2e9a2a84bbbca152;hb=25fe86c1db4017a46c3169912ceae8a6663b057e;hp=71cd6f1bda8d7b47c13e7ca36f61d23f3c2b4aa7;hpb=e5751bd57f29c80d7c1ce3a323d6e5a3925cebcb;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 71cd6f1bda..45ff320f46 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 $<;"
+	$(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` ; \
-		( cd $$TMP ; \
-		ln -s ../mf2pt1.mem . ; \
-		MFINPUTS=../..:../:: $(PERL) ../../$(buildscript-dir)/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; \
-		mv $$TMP/*pfb $(outdir) ; \
-		rm -rf $$TMP
+#
+# 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_DIR=`mktemp -d $(outdir)/pfbtemp.$*.XXXXXXXXX` \
+	&& ( cd $$TMP_DIR \
+		&& ln -s ../mf2pt1.mem . \
+		&& ln -s ../../mf2pt1.mp . \
+		&& MFINPUTS=$(abs-src-dir):..:: \
+		   FONTFORGE=$(FONTFORGE) \
+		   $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+	&& mv $$TMP_DIR/*pfb $(outdir); \
+	rm -rf $$TMP_DIR
 
-$(outdir)/mf2pt1.mem:
-	cd $(outdir) && mpost -progname=mpost -ini ../mf2pt1 \\dump
+# 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) \
+	   && touch mf2pt1.mem \
+	   && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump