Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / stepmake / stepmake / metafont-rules.make

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 304512da5e743f597c26d7a00010279786e24a4f..ab28ced9a5f3d8f0319580acb309d0012662d914 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,12 +1,27 @@
+# Don't remove $(outdir)/.log's.  Logs are a target!
 
+# we want to see botched results as well.
 $(outdir)/%.dvi: %.mf
-       mf $<
-       gftodvi  $(basename $<)
-       mv   $(basename $<).dvi $(outdir)
+       -MFINPUTS=$(src-dir) $(METAFONT) "\scrollmode; input $<;"
+       gftodvi $(basename $<)
+       mv $(basename $<).dvi $(outdir)
        rm $(basename $<).*gf
 
-$(outdir)/%.log: %.mf
-       mf $<
-       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
 
+# 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=$(top-src-dir)/mf:..:: $(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