Rename makefile variable TMP

Issue 4353

Rename makefile variable TMP

Windows (cygwin and mingw)
system uses environment
variable TMP for a special
purpose. It can not be used
for other purpose like
makefile variable.

diff --git a/input/regression/abc2ly/GNUmakefile b/input/regression/abc2ly/GNUmakefile
index 7356f99cb32e91ed9b17af7f82a70e4189825a23..438deba2c869709069d188f3519fbdb249f8aa28 100644 (file)
--- a/input/regression/abc2ly/GNUmakefile
+++ b/input/regression/abc2ly/GNUmakefile
@@ -5,8 +5,8 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc abc
 
 TEXI2HTML_FLAGS += --nomenu
 
-TMP = $(sort $(ABC_FILES) $(TEXINFO_SOURCES) )
-COLLATED_FILES = ${TMP:%.abc=$(outdir)/%.ly}
+TMP_FILES = $(sort $(ABC_FILES) $(TEXINFO_SOURCES) )
+COLLATED_FILES = ${TMP_FILES:%.abc=$(outdir)/%.ly}
 
 
 include $(depth)/make/stepmake.make

diff --git a/input/regression/midi/GNUmakefile b/input/regression/midi/GNUmakefile
index 682bf82db5b0864bbcf2117a078a39a29b9ca491..d6be6f62df2677fc2a182b594e75e9b236476ab0 100644 (file)
--- a/input/regression/midi/GNUmakefile
+++ b/input/regression/midi/GNUmakefile
@@ -5,8 +5,8 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc midi
 
 TEXI2HTML_FLAGS += --nomenu
 
-TMP = $(sort $(LY_FILES) $(TEXINFO_SOURCES) )
-COLLATED_FILES = ${TMP:%.ly=$(outdir)/%-midi.ly}
+TMP_FILES = $(sort $(LY_FILES) $(TEXINFO_SOURCES) )
+COLLATED_FILES = ${TMP_FILES:%.ly=$(outdir)/%-midi.ly}
 
 include $(depth)/make/stepmake.make
 

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 1db797468fbcd034afc444970f5de8386d9ac406..45ff320f467d31262a28f36d2e9a2a84bbbca152 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -19,15 +19,15 @@ $(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 $(outdir)/%.log
-       $(DO_MF_DEP) TMP=`mktemp -d $(outdir)/pfbtemp.$*.XXXXXXXXX` \
-       && ( cd $$TMP \
+       $(DO_MF_DEP) TMP_DIR=`mktemp -d $(outdir)/pfbtemp.$*.XXXXXXXXX` \
+       && ( cd $$TMP_DIR \
                && ln -s ../mf2pt1.mem . \
                && ln -s ../../mf2pt1.mp . \
                && MFINPUTS=$(abs-src-dir):..:: \
                   FONTFORGE=$(FONTFORGE) \
                   $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
-       && mv $$TMP/*pfb $(outdir); \
-       rm -rf $$TMP
+       && mv $$TMP_DIR/*pfb $(outdir); \
+       rm -rf $$TMP_DIR
 
 # 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