diff options
| -rw-r--r-- | ghc/compiler/Makefile | 4 | ||||
| -rw-r--r-- | ghc/includes/Makefile | 4 | ||||
| -rw-r--r-- | ghc/utils/Makefile | 1 | ||||
| -rw-r--r-- | ghc/utils/hp2ps/Makefile | 2 | ||||
| -rw-r--r-- | ghc/utils/hscpp/Makefile | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index af8efc06d9..0583c86053 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 25b31613bf..563ae50139 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 70489845a8..78554154df 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 90626ac593..b7c484b774 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 ddd80d1893..a7833213d6 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 |