Commit eacfbded authored by Simon Marlow's avatar Simon Marlow
Browse files

move INPLACE_DATA_DIR into mk/config.mk and share it

parent 8396eb36
......@@ -9,7 +9,6 @@ include $(TOP)/mk/boilerplate.mk
SUBDIRS = mangler split ghci
INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
INPLACE_PKG_CONF = $(INPLACE_DATA_DIR)/package.conf
# Used to signal that we are inplace, as opposed to installed:
INPLACE_FILE = $(INPLACE_DATA_DIR)/inplace
......
......@@ -44,9 +44,6 @@ clean.stage.%:
-$(CABAL) clean --distpref dist-stage$*
$(RM) -rf stage$*-inplace
# XXX This should be defined somewhere more central
INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
ifeq "$(GhcWithInterpreter)" "YES"
......
......@@ -752,6 +752,8 @@ GHC_MANGLER_DIR_REL = $(GHC_DRIVER_DIR_REL)/mangler
GHC_SPLIT_DIR_REL = $(GHC_DRIVER_DIR_REL)/split
GHC_SYSMAN_DIR_REL = $(GHC_RTS_DIR_REL)/parallel
INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
GHC_UTILS_DIR = $(FPTOOLS_TOP)/$(GHC_UTILS_DIR_REL)
GHC_INCLUDE_DIR = $(FPTOOLS_TOP)/$(GHC_INCLUDE_DIR_REL)
GHC_COMPILER_DIR = $(FPTOOLS_TOP)/$(GHC_COMPILER_DIR_REL)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment