diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index af8efc06d95412fd227c06d74c5fa639de56c852..0583c86053539953f30ab991e14d88e607f72f00 100644
--- 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 25b31613bfe5596eab0e0abc96591a9895a9b3d6..563ae5013959c1c5f57279e7e537624272eaac78 100644
--- 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 70489845a8ebbb1fa8665d8e58bb1ca5444f3575..78554154dfc55eca9645597c2aefe27b76bcb62c 100644
--- 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 90626ac593748f5b4f190cdaae54a3eb73825c90..b7c484b77467ab832596fd02eaac373f28f95eeb 100644
--- 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 ddd80d189314ef46548a706e15513f00daf61007..a7833213d672da64ac912cd0dca07e62e67a6f76 100644
--- 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