update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

[ghc-hetmet.git] / mk / tree.mk

diff --git a/mk/tree.mk b/mk/tree.mk
index 4d1416a..2010c36 100644 (file)
--- 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,14 +36,41 @@ 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
 
-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