From adfbae206ae6b57fc5ecbbab1f60f97b5fcfb100 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 6 Jan 2008 16:10:32 -0200 Subject: [PATCH] Mf2pt1 fixes: run mf2pt1 in a temp dir to fix filesystem pollution. --- stepmake/stepmake/metafont-rules.make | 9 ++++++++- stepmake/stepmake/metafont-vars.make | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 2030f00158..71cd6f1bda 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -13,8 +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 - cd $(outdir) && MFINPUTS=.. $(PERL) ../$(buildscript-dir)/mf2pt1.pl $(MF2PT1_OPTIONS) $< + 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 $(outdir)/mf2pt1.mem: cd $(outdir) && mpost -progname=mpost -ini ../mf2pt1 \\dump diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make index 49a755e6a3..25589e1f4d 100644 --- a/stepmake/stepmake/metafont-vars.make +++ b/stepmake/stepmake/metafont-vars.make @@ -7,7 +7,7 @@ MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log)) DVI_FILES += $(MF_DVI_FILES) TFM_FILES += $(MF_TFM_FILES) -MF2PT1_OPTIONS=--rounding=0.001 +MF2PT1_OPTIONS=--rounding=0.0001 -- 2.39.5