diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-18 11:47:53 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-18 11:47:53 +0000 |
| commit | eed437cdefb952e6c70e58012b23d436e74710af (patch) | |
| tree | 712e227f0461bae88a31ab0409e7d6c678cb81e3 /driver | |
| parent | 249bcf1f34e240a39abbcbb29bd6b97ddece421f (diff) | |
| download | haskell-eed437cdefb952e6c70e58012b23d436e74710af.tar.gz | |
More build system changes; ghc-pkg is now built with Cabal
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/driver/Makefile b/driver/Makefile index a8352090c1..cf842e47c1 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -9,13 +9,15 @@ include $(TOP)/mk/boilerplate.mk SUBDIRS = mangler split ghc ghci -boot all :: package.conf.inplace package.conf - -package.conf.inplace : - echo "[]" > $@ - -package.conf : - echo "[]" > $@ +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 + +boot all :: + $(MKDIRHIER) $(INPLACE_DATA_DIR) + test -e $(INPLACE_PKG_CONF) || echo "[]" > $(INPLACE_PKG_CONF) + touch $(INPLACE_FILE) override datadir = $(libdir) INSTALL_DATAS += package.conf ghc-usage.txt ghci-usage.txt |