INSTALL_FLAGS = --enable-shell-wrappers
endif
-boot:
- @:
+boot:: boot.stage.$(stage)
all:: build.stage.$(stage)
$(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
# It works because installPackage doesn't actually use ghc-pkg, as there's
# no library to register
-build.stage.%:
- $(CABAL) configure --distpref dist-stage$* \
- $(SET_DATA_SUBDIR) \
+boot.stage.%:
+ $(CABAL) configure --distpref dist-stage$* \
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
- $(CONFIGURE_FLAGS_STAGE$*) \
- $(COMMON_CONFIGURE_FLAGS)
+ $(CONFIGURE_FLAGS_STAGE$*) \
+ $(COMMON_CONFIGURE_FLAGS) \
+ --libsubdir=. \
+ --datadir='$$libdir' \
+ --datasubdir=.
+
+build.stage.%:
$(CABAL) build --distpref dist-stage$* $(BUILD_FLAGS)
$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
- $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
- $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
- '$$prefix/bin' \
- '$$prefix/lib' \
- '$$prefix/libexec' \
- '$$prefix/dynlib' \
- $(INPLACE_DATA_DIR) \
- '$$prefix/doc' \
- '$$prefix/html' \
- '$$prefix/haddock' \
- --distpref dist-stage$* \
+ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
+ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
+ '$$prefix/bin' \
+ '$(INPLACE_DATA_DIR)' \
+ '$$prefix/libexec' \
+ '$$prefix/dynlib' \
+ '$(INPLACE_DATA_DIR)' \
+ '$$prefix/doc' \
+ '$$prefix/html' \
+ '$$prefix/haddock' \
+ --distpref dist-stage$* \
$(INSTALL_FLAGS)
# XXX For now we always install the stage 2 compiler
install:
$(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
'$(prefix)' '$(bindir)' '$(libdir)' \
- '$(libexecdir)' '$(dynlibdir)' '$(datadir)' \
+ '$(libexecdir)' '$(dynlibdir)' '$(libdir)' \
'$(docdir)' '$(htmldir)' '$(haddockdir)' \
--distpref dist-stage2 \
$(INSTALL_FLAGS)