[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.

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 61c0cf5..f81bcae 100644 (file)
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -81,7 +81,7 @@ CHMOD       = chmod
 INSTALL            = @INSTALL@
 exeext      = @exeext@
 SED        = @SedCmd@
-TMPDIR      = /tmp
+DEFAULT_TMPDIR = /tmp
 
 # sigh
 INSTALL_DIR  = ./mkdirhier
@@ -130,7 +130,7 @@ config-pkgs ::
           echo '$$'"libexecdir='$(libdir)';"       >> bin/$(platform)/$$i ; \
           echo '$$'"datadir='$(datadir)';"         >> bin/$(platform)/$$i ; \
           echo '$$'"SED='$(SED)';"                 >> bin/$(platform)/$$i ; \
-          echo '$$'"TMPDIR='$(TMPDIR)';"           >> bin/$(platform)/$$i ; \
+          echo '$$'"DEFAULT_TMPDIR='$(DEFAULT_TMPDIR)';" >> bin/$(platform)/$$i ; \
           cat bin/$(platform)/$$i.prl              >> bin/$(platform)/$$i ; \
           $(CHMOD) $(BIN_PERMS) bin/$(platform)/$$i; \
           echo "Done."; \
@@ -147,7 +147,7 @@ config-pkgs ::
           echo '$$'"libexecdir='$(libdir)';"      >> lib/$(platform)/$$i ; \
           echo '$$'"datadir='$(datadir)';"        >> lib/$(platform)/$$i ; \
           echo '$$'"SED='$(SED)';"                >> lib/$(platform)/$$i ; \
-          echo '$$'"TMPDIR='$(TMPDIR)';"          >> lib/$(platform)/$$i ; \
+          echo '$$'"DEFAULT_TMPDIR='$(DEFAULT_TMPDIR)';"  >> lib/$(platform)/$$i ; \
           cat lib/$(platform)/$$i.prl >> lib/$(platform)/$$i; \
           $(CHMOD) $(BIN_PERMS) lib/$(platform)/$$i; \
           echo "Done."; \
@@ -164,7 +164,7 @@ config-pkgs ::
           echo "libexecdir='$(libdir)'"        >> bin/$(platform)/$$i ; \
           echo "datadir='$(datadir)'"          >> bin/$(platform)/$$i ; \
           echo "SED='$(SED)'"                  >> bin/$(platform)/$$i ; \
-          echo "TMPDIR='$(TMPDIR)'"            >> bin/$(platform)/$$i ; \
+          echo "DEFAULT_TMPDIR='$(DEFAULT_TMPDIR)'" >> bin/$(platform)/$$i ; \
           cat bin/$(platform)/$$i.sh >> bin/$(platform)/$$i; \
           $(CHMOD) $(BIN_PERMS) bin/$(platform)/$$i; \
           echo "Done."; \

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 10049e2..581c9c5 100644 (file)
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.43 2000/08/02 15:27:25 simonmar Exp $
+# $Id: Makefile,v 1.44 2000/09/05 10:16:41 simonmar Exp $
 #
 
 TOP=..
@@ -37,40 +37,40 @@ Config.hs : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @$(RM) -f Config.hs
        @echo -n "Creating Config.hs ... "
        @echo "module Config where" >>Config.hs
-       @echo "cProjectName          = \"$(ProjectName)\"" >> Config.hs            
-       @echo "cProjectVersion       = \"$(ProjectVersion)\"" >> Config.hs         
-       @echo "cProjectVersionInt    = \"$(ProjectVersionInt)\"" >> Config.hs      
-       @echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> Config.hs      
-       @echo "cHOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> Config.hs           
-       @echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> Config.hs         
-       @echo "cCURRENT_DIR          = \"$(CURRENT_DIR)\"" >> Config.hs            
-       @echo "cGHC_LIB_DIR          = \"$(GHC_LIB_DIR)\"" >> Config.hs            
-       @echo "cGHC_RUNTIME_DIR      = \"$(GHC_RUNTIME_DIR)\"" >> Config.hs        
-       @echo "cGHC_UTILS_DIR        = \"$(GHC_UTILS_DIR)\"" >> Config.hs          
-       @echo "cGHC_INCLUDE_DIR      = \"$(GHC_INCLUDE_DIR)\"" >> Config.hs        
-       @echo "cGHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> Config.hs        
+       @echo "cProjectName          = \"$(ProjectName)\"" >> Config.hs
+       @echo "cProjectVersion       = \"$(ProjectVersion)\"" >> Config.hs
+       @echo "cProjectVersionInt    = \"$(ProjectVersionInt)\"" >> Config.hs
+       @echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> Config.hs
+       @echo "cHOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> Config.hs
+       @echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> Config.hs
+       @echo "cCURRENT_DIR          = \"$(CURRENT_DIR)\"" >> Config.hs
+       @echo "cGHC_LIB_DIR          = \"$(GHC_LIB_DIR)\"" >> Config.hs
+       @echo "cGHC_RUNTIME_DIR      = \"$(GHC_RUNTIME_DIR)\"" >> Config.hs
+       @echo "cGHC_UTILS_DIR        = \"$(GHC_UTILS_DIR)\"" >> Config.hs
+       @echo "cGHC_INCLUDE_DIR      = \"$(GHC_INCLUDE_DIR)\"" >> Config.hs
+       @echo "cGHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> Config.hs
        @echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> Config.hs
-       @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> Config.hs   
-       @echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> Config.hs      
-       @echo "cGHC_UNLIT            = \"$(GHC_UNLIT)\"" >> Config.hs              
-       @echo "cGHC_HSC              = \"$(GHC_HSC)\"" >> Config.hs                
+       @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> Config.hs
+       @echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> Config.hs
+       @echo "cGHC_UNLIT            = \"$(GHC_UNLIT)\"" >> Config.hs
+       @echo "cGHC_HSC              = \"$(GHC_HSC)\"" >> Config.hs
        @echo "cGHC_MANGLER          = \"$(GHC_MANGLER)\"" >> Config.hs
        @echo "cGHC_SPLIT            = \"$(GHC_SPLIT)\"" >> Config.hs
        @echo "cGHC_STATS            = \"$(GHC_STATS)\"" >> Config.hs
-       @echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> Config.hs             
-       @echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> Config.hs        
-       @echo "cCP                   = \"$(CP)\"" >> Config.hs                     
-       @echo "cRM                   = \"$(RM)\"" >> Config.hs                     
-       @echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> Config.hs           
+       @echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> Config.hs
+       @echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> Config.hs
+       @echo "cCP                   = \"$(CP)\"" >> Config.hs
+       @echo "cRM                   = \"$(RM)\"" >> Config.hs
+       @echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> Config.hs
        @echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> Config.hs
-       @echo "cGhcWithRegisterised  = \"$(GhcWithRegisterised)\"" >> Config.hs    
-       @echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> Config.hs         
-       @echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> Config.hs          
-       @echo "clibdir               = \"$(libdir)\"" >> Config.hs                 
-       @echo "clibexecdir           = \"$(libexecdir)\"" >> Config.hs             
-       @echo "cdatadir              = \"$(datadir)\"" >> Config.hs                
-       @echo "cbindir               = \"$(bindir)\"" >> Config.hs                 
-       @echo "cTMPDIR               = \"$(TMPDIR)\"" >> Config.hs                 
+       @echo "cGhcWithRegisterised  = \"$(GhcWithRegisterised)\"" >> Config.hs
+       @echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> Config.hs
+       @echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> Config.hs
+       @echo "clibdir               = \"$(libdir)\"" >> Config.hs
+       @echo "clibexecdir           = \"$(libexecdir)\"" >> Config.hs
+       @echo "cdatadir              = \"$(datadir)\"" >> Config.hs
+       @echo "cbindir               = \"$(bindir)\"" >> Config.hs
+       @echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> Config.hs
        @echo "cFPTOOLS_TOP_ABS      = \"$(FPTOOLS_TOP_ABS)\"" >> Config.hs
        @echo "cRAWCPP               = \"$(RAWCPP)\"" >> Config.hs
        @echo done.

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index d92352f..981bafd 100644 (file)
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -17,7 +17,7 @@ SCRIPT_SUBST_VARS=\
  ProjectVersionInt
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += libdir libexecdir TMPDIR
+SCRIPT_SUBST_VARS += libdir libexecdir DEFAULT_TMPDIR
 endif
 
 #

diff --git a/ghc/utils/hstags/hstags.prl b/ghc/utils/hstags/hstags.prl
index a74a5a9..16e770b 100644 (file)
--- a/ghc/utils/hstags/hstags.prl
+++ b/ghc/utils/hstags/hstags.prl
@@ -3,7 +3,7 @@
 # set:
 #
 #   INSTALLING
-#   TMPDIR
+#   DEFAULT_TMPDIR
 #   TOP_PWD
 #   libdir
 #   libexecdir
@@ -13,8 +13,8 @@
 if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $tmp = $ENV{'TMPDIR'} . "/$$.eht";
 } else {
-    $tmp ="${TMPDIR}/$$.eht";
-    $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
+    $tmp ="${DEFAULT_TMPDIR}/$$.eht";
+    $ENV{'TMPDIR'} = ${DEFAULT_TMPDIR}; # set the env var as well
 }
 
 $TopPwd         = "${TOP_PWD}"; # *Only* needed when using it in-situ (i.e., INSTALLING=0).

diff --git a/ghc/utils/prof/Makefile b/ghc/utils/prof/Makefile
index 81916a1..7887be7 100644 (file)
--- a/ghc/utils/prof/Makefile
+++ b/ghc/utils/prof/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.4 2000/04/27 11:04:36 simonmar Exp $
+# $Id: Makefile,v 1.5 2000/09/05 10:16:41 simonmar Exp $
 #
 # (c) The GHC Team, 2000
 #
@@ -16,7 +16,7 @@ endif
 SCRIPT_SUBST_VARS= \
  FPTOOLS_TOP_ABS \
  INSTALLING \
- TMPDIR \
+ DEFAULT_TMPDIR \
  TARGETPLATFORM
 
 INSTALLED_SCRIPT_PROG  = ghcprof

diff --git a/ghc/utils/prof/ghcprof.prl b/ghc/utils/prof/ghcprof.prl
index b72a246..6d5cac7 100644 (file)
--- a/ghc/utils/prof/ghcprof.prl
+++ b/ghc/utils/prof/ghcprof.prl
@@ -1,9 +1,9 @@
 # -----------------------------------------------------------------------------
-# $Id: ghcprof.prl,v 1.3 2000/04/18 11:31:56 panne Exp $
+# $Id: ghcprof.prl,v 1.4 2000/09/05 10:16:41 simonmar Exp $
 #
 # (c) The GHC Team 2000
 #
-# needs: FPTOOLS_TOP_ABS, INSTALLING, TMPDIR, TARGETPLATFORM, libdir, libexecdir
+# needs: FPTOOLS_TOP_ABS, INSTALLING, DEFAULT_TMPDIR, TARGETPLATFORM, libdir, libexecdir
 #
 
 if ($ENV{'DAVINCIHOME'}) {
@@ -33,8 +33,8 @@ $cgprof_dir = ( $INSTALLING ? "$libexecdir"
 if ( $ENV{'TMPDIR'} ) {
     $Tmp_prefix = $ENV{'TMPDIR'} . "/ghcprof";
 } else {
-    $Tmp_prefix ="${TMPDIR}/ghcprof";
-    $ENV{'TMPDIR'} = "${TMPDIR}"; # set the env var as well
+    $Tmp_prefix ="${DEFAULT_TMPDIR}/ghcprof";
+    $ENV{'TMPDIR'} = "${DEFAULT_TMPDIR}"; # set the env var as well
 }
 
 # Create an new temporary filename.

diff --git a/ghc/utils/stat2resid/Makefile b/ghc/utils/stat2resid/Makefile
index 07def9b..42c0c41 100644 (file)
--- a/ghc/utils/stat2resid/Makefile
+++ b/ghc/utils/stat2resid/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.10 1999/10/04 14:03:50 simonmar Exp $
+# $Id: Makefile,v 1.11 2000/09/05 10:16:41 simonmar Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -17,7 +17,7 @@ SCRIPT_OBJS=stat2resid.prl
 INSTALLING=0
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS=TMPDIR
+SCRIPT_SUBST_VARS=DEFAULT_TMPDIR
 endif
 
 INTERP=perl

diff --git a/ghc/utils/stat2resid/stat2resid.prl b/ghc/utils/stat2resid/stat2resid.prl
index 71e4255..bf0a262 100644 (file)
--- a/ghc/utils/stat2resid/stat2resid.prl
+++ b/ghc/utils/stat2resid/stat2resid.prl
@@ -3,7 +3,7 @@
 #
 # Perl script expect bindings for the following variables to be prepended
 #
-#   TMPDIR libdir
+#   DEFAULT_TMPDIR libdir
 #
 # without them, not much success :-(
 #
@@ -14,8 +14,8 @@ $outsuffix = ".resid.ps";     # change as appropriate
 if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $tmpfile = $ENV{'TMPDIR'} . "/$$.resid.data";
 } else {
-    $tmpfile ="${TMPDIR}/$$.resid.data";
-    $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
+    $tmpfile ="${DEFAULT_TMPDIR}/$$.resid.data";
+    $ENV{'TMPDIR'} = ${DEFAULT_TMPDIR}; # set the env var as well
 }
 
 @INC = ( ${libdir} );

diff --git a/glafp-utils/ltx/Makefile b/glafp-utils/ltx/Makefile
index 1362185..6271c07 100644 (file)
--- 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 7504d55..96dbc71 100644 (file)
--- 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 d14fd37..3a6ed94 100644 (file)
--- 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 3438180..d879e7f 100644 (file)
--- 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 7ab7d4c..ec2f66a 100644 (file)
--- 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 3befe89..1b33388 100644 (file)
--- 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)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6ebd201..0e2896a 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -365,7 +365,12 @@ NoFibHcOpts = -O
 # this in build.mk or set your environment variable "TMPDIR" to point
 # to somewhere with more space.  (TMPDIR=. is a good choice).
 
-TMPDIR                 = /tmp
+# DEFAULT_TMPDIR isn't called TMPDIR because GNU make tends to
+# override the environment variable with the value of the make
+# variable when executing sub-processes, so setting the TMPDIR env var
+# would have no effect in the build tree.
+
+DEFAULT_TMPDIR         = /tmp
 
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.