GHC_DRIVER_DIR = driver
GHC_COMPAT_DIR = compat
-GHC_MKDEPENDC_DIR = $(GHC_UTILS_DIR)/mkdependC
GHC_LTX_DIR = $(GHC_UTILS_DIR)/ltx
GHC_LNDIR_DIR = $(GHC_UTILS_DIR)/lndir
GHC_MKDIRHIER_DIR = $(GHC_UTILS_DIR)/mkdirhier
GHC_SPLIT_DIR = $(GHC_DRIVER_DIR)/split
GHC_SYSMAN_DIR = $(GHC_RTS_DIR)/parallel
-INPLACE = inplace
-INPLACE_BIN = $(INPLACE)/bin
-INPLACE_LIB = $(INPLACE)/lib
-INPLACE_MINGW = $(INPLACE)/mingw
+INPLACE = inplace
+INPLACE_BIN = $(INPLACE)/bin
+INPLACE_LIB = $(INPLACE)/lib
+INPLACE_TOPDIR = $(INPLACE)/lib
+INPLACE_MINGW = $(INPLACE)/mingw
+INPLACE_PERL = $(INPLACE)/perl
+################################################################################
+#
+# Bindist testing directory
+#
+################################################################################
+
+BIN_DIST_INST_SUBDIR = "install dir"
+BIN_DIST_INST_DIR = bindisttest/$(BIN_DIST_INST_SUBDIR)
+
+################################################################################
+#
+# rm
+#
+################################################################################
+
+# These are here, rather than in config.mk, as they need to exist in an
+# unconfigured tree so that the various clean targets can be used
+# without configuring:
+ifeq "$(ONLY_SHOW_CLEANS)" "YES"
+RM = utils/testremove/wouldrm
+RM_OPTS = CLEAN_FILES
+RM_OPTS_REC = CLEAN_REC
+else
RM = rm
RM_OPTS = -f
+RM_OPTS_REC = -rf
+endif