-GHC_UNLIT_DIR := $(GHC_UTILS_DIR)/unlit
-GHC_MANGLER_DIR := $(GHC_DRIVER_DIR)/mangler
-GHC_SPLIT_DIR := $(GHC_DRIVER_DIR)/split
-GHC_STAT_DIR := $(GHC_DRIVER_DIR)/stats
+# ---------------------------------------------------
+# -- These variables are defined primarily so they can
+# -- be spat into Config.hs by ghc/compiler/Makefile
+#
+# -- See comments in ghc/compiler/main/SysTools.lhs
+
+
+PROJECT_DIR := ghc
+GHC_DRIVER_DIR := $(PROJECT_DIR)/driver
+GHC_UTILS_DIR := $(PROJECT_DIR)/utils
+
+GHC_TOUCHY_DIR = $(GHC_UTILS_DIR)/touchy
+
+GHC_UNLIT_DIR = $(GHC_UTILS_DIR)/unlit
+GHC_UNLIT = unlit$(EXE_SUFFIX)
+
+GHC_MANGLER_DIR = $(GHC_DRIVER_DIR)/mangler
+GHC_MANGLER = ghc-asm