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 /ghc/Makefile | |
| parent | 249bcf1f34e240a39abbcbb29bd6b97ddece421f (diff) | |
| download | haskell-eed437cdefb952e6c70e58012b23d436e74710af.tar.gz | |
More build system changes; ghc-pkg is now built with Cabal
Diffstat (limited to 'ghc/Makefile')
| -rw-r--r-- | ghc/Makefile | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ghc/Makefile b/ghc/Makefile index 312ab05bbe..f824e3acef 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -32,16 +32,8 @@ clean distclean:: $(RM) -rf stage1-inplace $(RM) -rf stage2-inplace -# XXX Eugh, can we do this better? The problem is making extra-gcc-opts -# infdable on both Linux and Windows. I guess this will go away when we -# drop the mangler? -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" -SET_DATA_SUBDIR = --datasubdir=. -INPLACE_DATA_DIR = '$$prefix' -else -SET_DATA_SUBDIR = -INPLACE_DATA_DIR = '$$prefix/data' -endif +# XXX This should be defined somewhere more central +INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir CONFIGURE_FLAGS_STAGE1 += --flags=-ghci @@ -74,7 +66,6 @@ CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS) boot.stage.%: $(CABAL) configure --distpref dist-stage$* \ - $(SET_DATA_SUBDIR) \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ $(CONFIGURE_FLAGS_STAGE$*) \ $(COMMON_CONFIGURE_FLAGS) @@ -88,7 +79,7 @@ build.stage.%: '$$prefix/lib' \ '$$prefix/libexec' \ '$$prefix/dynlib' \ - $(INPLACE_DATA_DIR) \ + '$(INPLACE_DATA_DIR)' \ '$$prefix/doc' \ '$$prefix/html' \ '$$prefix/haddock' \ |