X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=3a7b158aead63d394491bc66adf6813a6d6dee5e;hb=57482bd044a81992326acadabf4787cccb6fc83c;hp=50bc00752960e534cbb3be4d20edc62dab36c896;hpb=6bdbf3cec90ac534de6d20a401dc6ddea50b7f82;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 50bc007529..3a7b158aea 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -8,7 +8,7 @@ $(outdir)/%.dvi: %.mf
 	rm $(basename $<).*gf
 
 $(outdir)/%.tfm $(outdir)/%.log: %.mf
-	MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
+	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
@@ -16,12 +16,12 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
 # 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 $(outdir)/mf2pt1.mem . ; \
-		MFINPUTS=$(src-dir):$(outdir):: $(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; \
-		mv $$TMP/*pfb $(outdir) ; \
-		rm -rf $$TMP
+	TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \
+	&& ( cd $$TMP \
+		&& ln -s ../mf2pt1.mem . \
+		&& MFINPUTS=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+	&& mv $$TMP/*pfb $(outdir); \
+	rm -rf $$TMP
 
 $(outdir)/mf2pt1.mem: mf2pt1.mp
 	cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump