-#-----------------------------------------------------------------------------
-# Extra things ``only for'' for the ghc project
-
-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
-
-GHC_MKDEPENDHS_DIR := $(GHC_UTILS_DIR)/mkdependHS
-GHC_HSCPP_DIR := $(GHC_UTILS_DIR)/hscpp
-GHC_HSC_DIR := $(GHC_COMPILER_DIR)
-GHC_UNLIT_DIR := $(GHC_UTILS_DIR)/unlit
-
-GHC_INPLACE = $(GHC_DRIVER_DIR)/ghc-inplace
-GHC_HSCPP = $(GHC_HSCPP_DIR)/hscpp
-GHC_MKDEPENDHS = $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
-GHC_HSC = $(GHC_HSC_DIR)/hsc
-UNLIT = $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT = $(GHC_UNLIT_DIR)/unlit
-
-GHC_SYSMAN = $(GHC_RUNTIME_DIR)/parallel/SysMan
-GHC_SYSMAN_DIR = $(GHC_RUNTIME_DIR)/parallel
+GHC_UNLIT_DIR_REL = $(GHC_UTILS_DIR_REL)/unlit
+GHC_HSTAGS_DIR_REL = $(GHC_UTILS_DIR_REL)/hasktags
+GHC_TOUCHY_DIR_REL = $(GHC_UTILS_DIR_REL)/touchy
+GHC_PKG_DIR_REL = $(GHC_UTILS_DIR_REL)/ghc-pkg
+GHC_GENPRIMOP_DIR_REL = $(GHC_UTILS_DIR_REL)/genprimopcode
+GHC_MANGLER_DIR_REL = $(GHC_DRIVER_DIR_REL)/mangler
+GHC_SPLIT_DIR_REL = $(GHC_DRIVER_DIR_REL)/split
+GHC_SYSMAN_DIR_REL = $(GHC_RUNTIME_DIR_REL)/parallel