diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index ac33ac7cee43a6c894463001fbacbd9ecdb15d4d..d109fbae39b800d6b0c36e1be44574a3f90a8f96 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -18,7 +18,7 @@ else SUBDIRS= endif -HC = $(GHC) +HC = $(GHC_INPLACE) #----------------------------------------------------------------------------- # Setting the standard variables diff --git a/ghc/lib/std/cbits/Makefile b/ghc/lib/std/cbits/Makefile index 011c92972e787e0145323830b88c18acb602ded1..9132b6e4e5be7b0f964c712f98633f8b00692085 100644 --- a/ghc/lib/std/cbits/Makefile +++ b/ghc/lib/std/cbits/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.10 1999/12/04 15:17:42 panne Exp $ +# $Id: Makefile,v 1.11 1999/12/07 15:49:53 simonmar Exp $ TOP = ../../.. include $(TOP)/mk/boilerplate.mk @@ -36,7 +36,7 @@ SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lgmp -L. -L../../../rts/gmp - # # Compile the files using the Haskell compiler (ghc really). # -CC=$(GHC) +CC=$(GHC_INPLACE) SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk index ff7850d182ed31ad9e7f784ad02f10ddeadde264..b276a87f0b9e3ce466b324d69e4716a04ebb643a 100644 --- a/ghc/mk/paths.mk +++ b/ghc/mk/paths.mk @@ -43,7 +43,7 @@ GHC_INCLUDE_DIR = $(TOP)/includes GHC_UTILS_DIR = $(TOP)/utils GHC_INTERPRETER_DIR = $(TOP)/interpreter -GHC = $(GHC_DRIVER_DIR)/ghc-inplace +GHC_INPLACE = $(GHC_DRIVER_DIR)/ghc-inplace GHC_HSCPP_DIR = $(GHC_UTILS_DIR)/hscpp GHC_HSCPP = $(GHC_HSCPP_DIR)/hscpp GHC_MKDEPENDHS_DIR = $(GHC_UTILS_DIR)/mkdependHS