X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=3a7b158aead63d394491bc66adf6813a6d6dee5e;hb=7d7601318b38b4c8cd10495d52fd5b20e61907e0;hp=bf7d6a0a9d29089f98c7616481c2362677d2d792;hpb=7754ac4c2bde14d03af8a85d46c6a9e26fa0734b;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index bf7d6a0a9d..3a7b158aea 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,28 +1,27 @@
+# Don't remove $(outdir)/.log's.  Logs are a target!
 
+# we want to see botched results as well.
 $(outdir)/%.dvi: %.mf
-	$(METAFONT) $<
-	gftodvi  $(basename $<)
-	mv   $(basename $<).dvi $(outdir)
+	-MFINPUTS=$(src-dir) $(METAFONT) "\scrollmode; input $<;"
+	gftodvi $(basename $<)
+	mv $(basename $<).dvi $(outdir)
 	rm $(basename $<).*gf
 
-$(outdir)/%.log: %.mf
-	$(METAFONT) $<
-	mv $(@F) $@
-	rm $(basename $< ).*gf
+$(outdir)/%.tfm $(outdir)/%.log: %.mf
+	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
 
-$(outdir)/%.tfm: %.mf
-	$(METAFONT) "\mode:=$(MFMODE); input $<;"
-	mv $(@F) $(outdir)
-	rm $(basename $<).*gf $(basename $<).*log
+# 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=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+	&& mv $$TMP/*pfb $(outdir); \
+	rm -rf $$TMP
 
-$(outdir)/%.$(XPM_RESOLUTION)gf: %.mf
-	$(METAFONT) "\\mode=$(XPM_MODE); \\input $<"
-	mv $(@F) out
-	rm -f $(basename $<).log $(basename $<).tfm
-
-$(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
-	gftopk $< $@
-
-%.afm:
-	$(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm)
-	mv $@ $@.in
+$(outdir)/mf2pt1.mem: mf2pt1.mp
+	cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump