[project @ 1997-03-24 04:28:23 by sof]

Made WAYS immune

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index af8efc0..0583c86 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,12 +1,12 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.11 1997/03/19 20:44:52 simonpj Exp $
+# $Id: Makefile,v 1.12 1997/03/24 04:31:45 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
 #-----------------------------------------------------------------------------
 # Building hsc different ways (default is just `normal' sequential)
-WAYS=$(GhcCompilerWays)
+override WAYS=$(GhcCompilerWays)
 
 #-----------------------------------------------------------------------------
 #              Set SUBDIRS

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index 25b3161..563ae50 100644 (file)
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -8,7 +8,7 @@ include $(TOP)/mk/boilerplate.mk
 #
 # Just to make sure, no ways stuff in here, please.
 #
-WAYS=
+override WAYS=
 
 # De-litted header files
 LH_FILES=$(wildcard *.lh)
@@ -95,7 +95,7 @@ boot :: all
 # (ditto for interface files). This is not *really* needed, but
 # it gives (perhaps) a cleaner binary dist structure..might change.
 #
-datadir:=$(libdir)/includes
+override datadir:=$(libdir)/includes
 INSTALL_DATAS += $(DELIT_H_FILES) $(H_FILES) $(TARGETPLATFORM).h $(H_CONFIG)
 
 #

diff --git a/ghc/utils/Makefile b/ghc/utils/Makefile
index 7048984..7855415 100644 (file)
--- a/ghc/utils/Makefile
+++ b/ghc/utils/Makefile
@@ -4,6 +4,7 @@ include $(TOP)/mk/boilerplate.mk
 #
 # No ways stuff in here (and further below), please
 #
+override WAYS=
 export WAYS=
 
 ifneq "$(BIN_DIST_NAME)" ""

diff --git a/ghc/utils/hp2ps/Makefile b/ghc/utils/hp2ps/Makefile
index 90626ac..b7c484b 100644 (file)
--- a/ghc/utils/hp2ps/Makefile
+++ b/ghc/utils/hp2ps/Makefile
@@ -1,6 +1,6 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
-WAYS=
+override WAYS=
 
 C_SRCS  = $(wildcard *.c)
 H_SRCS  = $(wildcard *.h)

diff --git a/ghc/utils/hscpp/Makefile b/ghc/utils/hscpp/Makefile
index ddd80d1..a783321 100644 (file)
--- a/ghc/utils/hscpp/Makefile
+++ b/ghc/utils/hscpp/Makefile
@@ -1,6 +1,6 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
-WAYS=
+override WAYS=
 
 SCRIPT_PROG=hscpp
 SCRIPT_OBJS=hscpp.prl