Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index b33bd10be6919f7db261dfb56714e1fa2ff04769..64bdecf6775fcc8df561ad3313ac573251aa677f 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -13,11 +13,15 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
        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:..:: $(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) \
+       && mv $$TMP/*pfb $(outdir); \
+       rm -rf $$TMP
 
-MFTRACE_FORMATS = pfa pfb svg
-$(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
-       MFINPUTS=$(src-dir) $(MFTRACE) $(MFTRACE_FLAGS) -I $(src-dir) -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
-#      -mv $(MFTRACE_FORMATS:%=$(basename $(@F).%)) $(outdir)
-       -mv $(basename $(@F)).pfa $(outdir)
-       -mv $(basename $(@F)).pfb $(outdir)
-       -mv $(basename $(@F)).svg $(outdir)
+$(outdir)/mf2pt1.mem: mf2pt1.mp
+       cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump