use trap to remove tmp directory on failure to avoid hiding mpost

failures

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 6d81f550ac89892ba86107e4054dd13d72160cc6..9febf64566ac1851d1b71f6e9a55173e7ce7e0a8 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -19,13 +19,13 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
 # the soft link for mf2pt1.mp is for recent mpost versions
 # which no longer dump a .mem file
 $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
-       TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \
-       && ( cd $$TMP \
+       TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX`; \
+       trap "rm -rf '$TMP'" 0; \
+       ( cd $$TMP \
                && ln -s ../mf2pt1.mem . \
                && ln -s ../../mf2pt1.mp . \
                && MFINPUTS=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
-       && mv $$TMP/*pfb $(outdir); \
-       rm -rf $$TMP
+       && mv $$TMP/*pfb $(outdir) && rm -rf "$TMP";
 
 # since recent mpost versions no longer create a mem file, we create a dummy
 # file to satisfy the dependency (which gets overwritten in case an older