[project @ 2000-09-05 10:16:40 by simonmar]

Rename the make variable TMPDIR to DEFAULT_TMPDIR.  This fixes the
problem that saying 'TMPDIR=/foo make' in an fptools tree didn't work,
because GNU make is in the habit of overriding an environment variable
with the value of the corresponding make variable in a sub-process.

6 files changed, 13 insertions, 13 deletions

diff --git a/glafp-utils/ltx/Makefile b/glafp-utils/ltx/Makefile
index 1362185092..6271c07b42 100644
--- a/glafp-utils/ltx/Makefile
+++ b/glafp-utils/ltx/Makefile
@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
 
 SCRIPT_PROG=ltx
 SCRIPT_OBJS=ltx.prl
-SCRIPT_SUBST_VARS=TMPDIR CONTEXT_DIFF
+SCRIPT_SUBST_VARS=DEFAULT_TMPDIR CONTEXT_DIFF
 
 INTERP=perl
 DESTDIR=$(INSTSCRIPTDIR)
diff --git a/glafp-utils/ltx/ltx.prl b/glafp-utils/ltx/ltx.prl
index 7504d5510e..96dbc71026 100644
--- a/glafp-utils/ltx/ltx.prl
+++ b/glafp-utils/ltx/ltx.prl
@@ -1,7 +1,7 @@
 #
 # The perl script requires bindings for the following
 # variables to be prepended:
-#     TMPDIR
+#     DEFAULT_TMPDIR
 #     CONTEXTDIFF
 #
 
@@ -37,8 +37,8 @@ if (-f $ARGV[0]) {
 if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $Tmp_prefix = $ENV{'TMPDIR'} ;
 } else {
-    $Tmp_prefix ="$TMPDIR";
-    $ENV{'TMPDIR'} = "$TMPDIR"; # set the env var as well
+    $Tmp_prefix ="$DEFAULT_TMPDIR";
+    $ENV{'TMPDIR'} = "$DEFAULT_TMPDIR"; # set the env var as well
 }
 
 sub rm_temp_files {
diff --git a/glafp-utils/mkdependC/Makefile b/glafp-utils/mkdependC/Makefile
index d14fd379a6..3a6ed94d62 100644
--- a/glafp-utils/mkdependC/Makefile
+++ b/glafp-utils/mkdependC/Makefile
@@ -13,7 +13,7 @@ SCRIPT_OBJS=mkdependC.prl
 # Prepend (perl) bindings for these Makefile variables
 # when creating `mkdependC' (a more flexible way of doing msub).
 #
-SCRIPT_SUBST_VARS=TMPDIR CPP
+SCRIPT_SUBST_VARS=DEFAULT_TMPDIR CPP
 
 CLEAN_FILES += $(SCRIPT_PROG)
 INTERP=perl
diff --git a/glafp-utils/mkdependC/mkdependC.prl b/glafp-utils/mkdependC/mkdependC.prl
index 343818095b..d879e7f4f7 100644
--- a/glafp-utils/mkdependC/mkdependC.prl
+++ b/glafp-utils/mkdependC/mkdependC.prl
@@ -2,7 +2,7 @@
 # This stub of perl assumes that the following two
 # variables are prepended:
 #
-# TMPDIR CPP
+# DEFAULT_TMPDIR CPP
 #
 # ToDo: strip out all the .h junk
 #
@@ -26,8 +26,8 @@ $baseName='';
 if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $Tmp_prefix = $ENV{'TMPDIR'} . "/mkdependC$$";
 } else {
-    $Tmp_prefix ="${TMPDIR}/mkdependC$$";
-    $ENV{'TMPDIR'} = "${TMPDIR}"; # set the env var as well
+    $Tmp_prefix ="${DEFAULT_TMPDIR}/mkdependC$$";
+    $ENV{'TMPDIR'} = "${DEFAULT_TMPDIR}"; # set the env var as well
 }
 
 $tempfile = '';
diff --git a/glafp-utils/runstdtest/Makefile b/glafp-utils/runstdtest/Makefile
index 7ab7d4ccef..ec2f66abc7 100644
--- a/glafp-utils/runstdtest/Makefile
+++ b/glafp-utils/runstdtest/Makefile
@@ -1,4 +1,4 @@
-#
+# $Id: Makefile,v 1.5 2000/09/05 10:16:41 simonmar Exp $
 #
 
 TOP=..
@@ -6,7 +6,7 @@ include $(TOP)/mk/boilerplate.mk
 
 SCRIPT_PROG=runstdtest
 SCRIPT_OBJS=runstdtest.prl
-SCRIPT_SUBST_VARS=RM TMPDIR CONTEXT_DIFF
+SCRIPT_SUBST_VARS=RM DEFAULT_TMPDIR CONTEXT_DIFF
 INTERP=perl
 
 CLEAN_FILES += $(SCRIPT_PROG)
diff --git a/glafp-utils/runstdtest/runstdtest.prl b/glafp-utils/runstdtest/runstdtest.prl
index 3befe89c98..1b33388cd2 100644
--- a/glafp-utils/runstdtest/runstdtest.prl
+++ b/glafp-utils/runstdtest/runstdtest.prl
@@ -2,7 +2,7 @@
 # The perl script requires the following variables to be bound
 # to something meaningful before it will operate correctly:
 #   
-#   TMPDIR
+#   DEFAULT_TMPDIR
 #   CONTEXT_DIFF
 #   RM
 #
@@ -51,8 +51,8 @@ $PgmStdinFile  = '/dev/null';
 if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $TmpPrefix = $ENV{'TMPDIR'};
 } else {
-    $TmpPrefix ="$TMPDIR";
-    $ENV{'TMPDIR'} = "$TMPDIR"; # set the env var as well
+    $TmpPrefix ="$DEFAULT_TMPDIR";
+    $ENV{'TMPDIR'} = "$DEFAULT_TMPDIR"; # set the env var as well
 }
 $ScriptFile = "$TmpPrefix/run_me$$";
 $DefaultStdoutFile = "$TmpPrefix/no_stdout$$"; # can't use /dev/null (e.g. Alphas)