From 8dd74d9902782edbd3a1f0dddcaeca29759b7be1 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Tue, 28 Apr 2015 14:29:52 +0100 Subject: [PATCH] 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. --- input/regression/abc2ly/GNUmakefile | 4 ++-- input/regression/midi/GNUmakefile | 4 ++-- stepmake/stepmake/metafont-rules.make | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/input/regression/abc2ly/GNUmakefile b/input/regression/abc2ly/GNUmakefile index 7356f99cb3..438deba2c8 100644 --- 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 682bf82db5..d6be6f62df 100644 --- 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 1db797468f..45ff320f46 100644 --- 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 -- 2.39.2