[project @ 1999-10-05 10:30:26 by simonmar]

[ghc-hetmet.git] / ghc / mk / paths.mk

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index a6bb13e..bf10fec 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -3,10 +3,6 @@
 # ghc project specific make variables
 #
 
-# Override default haskell compiler if required
-#HC                    = $(WithGhcHc)
-HaskellCompilerType    = $(WithGhcHcType)
-
 GCap=-optc-DGCap
 #GC2s=-optc-DGC2s
 #GC1s=-optc-DGC1s
@@ -41,14 +37,16 @@ endif
 
 GHC_DRIVER_DIR         = $(TOP)/driver
 GHC_COMPILER_DIR       = $(TOP)/compiler
-GHC_RUNTIME_DIR        = $(TOP)/runtime
+GHC_RUNTIME_DIR        = $(TOP)/rts
 GHC_LIB_DIR            = $(TOP)/lib
 GHC_INCLUDE_DIR        = $(TOP)/includes
 GHC_UTILS_DIR          = $(TOP)/utils
 
-GHC                    = $(GHC_DRIVER_DIR)/ghc
+GHC                    = $(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
+GHC_MKDEPENDHS                 = $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
 GHC_HSP                = $(GHC_HSP_DIR)/hsp
 GHC_HSP_DIR            = $(GHC_HSC_DIR)
 GHC_HSC                = $(GHC_HSC_DIR)/hsc