From a82216ba857211f4328cef3835819bfb8620ef65 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 6 Feb 2008 09:36:05 +0100 Subject: [PATCH] Another fix for mpost: $(outdir) is relative. Also: chain commands with &&. Fixes rumbling on when commands fail. --- stepmake/stepmake/metafont-rules.make | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 50bc007529..dfae13f1b4 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -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 $(outdir)/mf2pt1.mem . ; \ - MFINPUTS=$(src-dir):$(outdir):: $(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; \ - mv $$TMP/*pfb $(outdir) ; \ - rm -rf $$TMP + TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \ + && ( cd $$TMP \ + && ln -s ../mf2pt1.mem . \ + && MFINPUTS=$(src-dir):..:: $(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) \ + && 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 -- 2.39.5