X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=592a47b35159fd5d64e54c328fbce5371729abf6;hb=bb8825ac8c114c2e7585f159f4803d952577b2ec;hp=71cd6f1bda8d7b47c13e7ca36f61d23f3c2b4aa7;hpb=3827988ac5a8d758508b68b4de399bf351504d03;p=lilypond.git

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