X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=5b6ad17d91a0a204a1470509e61ea3cdac5e19e7;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=c1728f9924b1efcf9672a33bae1740960765bc22;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index c1728f9924..5b6ad17d91 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -18,8 +18,8 @@ $(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` \
+$(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem $(outdir)/%.log
+	TMP=`mktemp -d $(outdir)/pfbtemp.$*.XXXXXXXXX` \
 	&& ( cd $$TMP \
 		&& ln -s ../mf2pt1.mem . \
 		&& ln -s ../../mf2pt1.mp . \
@@ -27,5 +27,10 @@ $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
 	&& 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
+# mpost creates a real mem file)
 $(outdir)/mf2pt1.mem: mf2pt1.mp
-	cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump
+	cd $(outdir) \
+	   && touch mf2pt1.mem \
+	   && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump