diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2008-08-13 14:47:07 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2008-08-13 14:47:07 +0000 |
| commit | eacfbdedf46dcc3105de1bbf642cf2572526c705 (patch) | |
| tree | ef6420d680ea6d4abe907fc2833c225fcb99bc2a | |
| parent | 8396eb36ed1aa4ca23b44afba163e41282e01096 (diff) | |
| download | haskell-eacfbdedf46dcc3105de1bbf642cf2572526c705.tar.gz | |
move INPLACE_DATA_DIR into mk/config.mk and share it
| -rw-r--r-- | driver/Makefile | 1 | ||||
| -rw-r--r-- | ghc/Makefile | 3 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/driver/Makefile b/driver/Makefile index f552a36e34..ca3504c283 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 4160cdc6d4..3035b43303 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 3812475aaf..f4e156d66c 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) |