X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftree.mk;h=3aa85277b072c35a2a0e2a3fe0e1a525cc79c18d;hb=8a23f2d9b91e8bf180a8578b2c929961b3c1825b;hp=4d1416a3efab6fdef023c1b34d468b4d6a6b69ff;hpb=6793a033e1ce41f77316675e8f7aa83196a9b211;p=ghc-hetmet.git

diff --git a/mk/tree.mk b/mk/tree.mk
index 4d1416a..3aa8527 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
@@ -41,10 +40,38 @@ GHC_MANGLER_DIR         = $(GHC_DRIVER_DIR)/mangler
 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
 
-RM			= rm -f
+################################################################################
+#
+#    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