From: Simon Marlow <marlowsd@gmail.com>
Date: Wed, 13 Aug 2008 14:47:07 +0000 (+0000)
Subject: move INPLACE_DATA_DIR into mk/config.mk and share it
X-Git-Tag: 2008-09-12~195
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=eacfbdedf46dcc3105de1bbf642cf2572526c705

move INPLACE_DATA_DIR into mk/config.mk and share it
---

diff --git a/driver/Makefile b/driver/Makefile
index f552a36..ca3504c 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -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
diff --git a/ghc/Makefile b/ghc/Makefile
index 4160cdc..3035b43 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -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"
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 3812475..f4e156d 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -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)