X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftree.mk;h=2010c362f3a4e322e169ad3d466c2e8b99f7b1a0;hb=3d8e6f6b1910080defad4ab2687255eb6e6df34b;hp=cd3988d772689b92285a88ecc12f3f63d7c74449;hpb=926ae90b75cd3368049854898062a563e57c9ad2;p=ghc-hetmet.git

diff --git a/mk/tree.mk b/mk/tree.mk
index cd3988d..2010c36 100644
--- a/mk/tree.mk
+++ b/mk/tree.mk
@@ -23,7 +23,6 @@ GHC_RTS_DIR             = rts
 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
@@ -37,7 +36,6 @@ GHC_PKG_DIR             = $(GHC_UTILS_DIR)/ghc-pkg
 GHC_GENPRIMOP_DIR       = $(GHC_UTILS_DIR)/genprimopcode
 GHC_GENAPPLY_DIR        = $(GHC_UTILS_DIR)/genapply
 GHC_CABAL_DIR           = $(GHC_UTILS_DIR)/ghc-cabal
-GHC_MANGLER_DIR         = $(GHC_DRIVER_DIR)/mangler
 GHC_SPLIT_DIR           = $(GHC_DRIVER_DIR)/split
 GHC_SYSMAN_DIR          = $(GHC_RTS_DIR)/parallel
 
@@ -46,10 +44,33 @@ 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