-GHC_DRIVER_DIR = $(TOP)/driver
-GHC_COMPILER_DIR = $(TOP)/compiler
-GHC_RUNTIME_DIR = $(TOP)/runtime
-GHC_LIB_DIR = $(TOP)/lib
-GHC_INCLUDE_DIR = $(TOP)/includes
-GHC_UTILS_DIR = $(TOP)/utils
-
-GHC = $(GHC_DRIVER_DIR)/ghc
-GHC_HSCPP_DIR = $(GHC_UTILS_DIR)/hscpp
-GHC_HSCPP = $(GHC_HSCPP_DIR)/hscpp
-GHC_HSP = $(GHC_HSP_DIR)/hsp
-GHC_HSP_DIR = $(GHC_HSC_DIR)
-GHC_HSC = $(GHC_HSC_DIR)/hsc
-GHC_HSC_DIR = $(GHC_COMPILER_DIR)
-GHC_SYSMAN = $(GHC_RUNTIME_DIR)/gum/SysMan
-GHC_SYSMAN_DIR = $(GHC_RUNTIME_DIR)/gum
-
-#-----------------------------------------------------------------------------
-# Stuff for the C-compiling phase in particular...
-
-# NON-OPTIMISING C COMPILATION: =================================
+GHC_DRIVER_DIR := $(TOP)/driver
+GHC_COMPILER_DIR := $(TOP)/compiler
+GHC_RUNTIME_DIR := $(TOP)/rts
+GHC_LIB_DIR := $(TOP)/lib
+GHC_INCLUDE_DIR := $(TOP)/includes
+GHC_UTILS_DIR := $(TOP)/utils
+GHC_INTERPRETER_DIR := $(TOP)/interpreter