[project @ 1998-02-04 20:56:20 by sof]

don't substitute TMPDIR when making binary dists (BIN_DIST=1)

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 31c6869..52b698b 100644 (file)
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -37,7 +37,7 @@ endif
 SCRIPT_SUBST_VARS := \
   INSTALLING \
   PROJECTNAME PROJECTVERSION PROJECTPATCHLEVEL \
-  CURRENT_DIR TMPDIR HOSTPLATFORM TARGETPLATFORM \
+  CURRENT_DIR HOSTPLATFORM TARGETPLATFORM \
   GHC_LIB_DIR GHC_RUNTIME_DIR GHC_UTILS_DIR GHC_INCLUDE_DIR \
   GHC_OPT_HILEV_ASM GhcWithNativeCodeGen LeadingUnderscore\
   GHC_UNLIT GHC_HSCPP GHC_HSC GHC_SYSMAN \
@@ -53,7 +53,7 @@ SCRIPT_SUBST_VARS := \
 ifeq "$(BIN_DIST)" "1"
 SCRIPT_PREFIX_FILES=prefix.txt
 else
-SCRIPT_SUBST_VARS += libdir libexecdir datadir bindir TOP_PWD
+SCRIPT_SUBST_VARS += libdir libexecdir datadir bindir TMPDIR TOP_PWD
 endif
 
 all :: $(DYN_LOADABLE_BITS)

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index 3653ec3..4f46318 100644 (file)
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -12,12 +12,11 @@ SCRIPT_OBJS=hstags.prl
 
 SCRIPT_SUBST_VARS=\
  INSTALLING \
- TMPDIR \
  TOP_PWD \
  PROJECTVERSION
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += libdir
+SCRIPT_SUBST_VARS += libdir TMPDIR
 endif
 
 #

diff --git a/ghc/utils/mkdependHS/Makefile b/ghc/utils/mkdependHS/Makefile
index feffac4..e05813d 100644 (file)
--- a/ghc/utils/mkdependHS/Makefile
+++ b/ghc/utils/mkdependHS/Makefile
@@ -7,7 +7,6 @@ boot :: all
 SCRIPT_PROG=mkdependHS
 SCRIPT_OBJS=mkdependHS.prl
 SCRIPT_SUBST_VARS= \
- TMPDIR \
  TOP_PWD \
  INSTALLING \
  PROJECTVERSION
@@ -20,7 +19,7 @@ INTERP=perl
 INSTALL_SCRIPTS += $(SCRIPT_PROG)
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += libdir datadir RAWCPP SED
+SCRIPT_SUBST_VARS += libdir datadir RAWCPP TMPDIR SED
 endif
 
 

diff --git a/ghc/utils/stat2resid/Makefile b/ghc/utils/stat2resid/Makefile
index 4b3fad1..929b870 100644 (file)
--- a/ghc/utils/stat2resid/Makefile
+++ b/ghc/utils/stat2resid/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.8 1997/09/05 09:16:34 simonm Exp $
+# $Id: Makefile,v 1.9 1998/02/04 20:56:24 sof Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -16,7 +16,9 @@ SCRIPT_OBJS=stat2resid.prl
 #
 INSTALLING=0
 
+ifneq "$(BIN_DIST)" "1"
 SCRIPT_SUBST_VARS=TMPDIR
+endif
 
 INTERP=perl
 CLEAN_FILES += $(SCRIPT_PROG)