Commit 1e22c3c6 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Tweak the build system for installPackage

parent 4d7ecf30
......@@ -9,7 +9,7 @@ ifeq "$(BootingFromHc)" "YES"
SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode unlit
else
SUBDIRS = mkdependC mkdirhier runstdtest hp2ps \
installPackage parallel unlit genprimopcode genapply runghc hpc pwd
parallel unlit genprimopcode genapply runghc hpc pwd
endif
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
# lndir doesn't build on Windows
......@@ -53,9 +53,9 @@ boot ::
$(MAKE) -C genprimopcode
endif
WITH_BOOTSTRAPPING_COMPILER = ghc-pkg hsc2hs
WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs
WITH_STAGE1 = ghc-pkg hasktags
WITH_STAGE1 = installPackage ghc-pkg hasktags
ifneq "$(NO_INSTALL_HSC2HS)" "YES"
WITH_STAGE1 += hsc2hs
endif
......
TOP=../..
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/cabal-flags.mk
boot:
$(CABAL) configure --distpref dist-inplace \
$(INPLACE_DIRS_CONFIGURE_FLAGS) \
$(USE_BOOT_CONFIGURE_FLAGS) \
$(COMMON_CONFIGURE_FLAGS)
$(CABAL) build --distpref dist-inplace $(BUILD_FLAGS)
$(CABAL) install --distpref dist-inplace
# XXX
#all:
# $(CABAL) configure --distpref dist-install \
# $(INPLACE_DIRS_CONFIGURE_FLAGS) \
# $(USE_STAGE1_CONFIGURE_FLAGS) \
# $(COMMON_CONFIGURE_FLAGS)
# $(CABAL) build --distpref dist-install $(BUILD_FLAGS)
all:
clean: distclean
distclean:
-$(CABAL) clean --distpref dist-inplace
-$(CABAL) clean --distpref dist-install
# XXX fix:
#binary-dist:
# $(INSTALL_DIR) $(BIN_DIST_DIR)/utils/hsc2hs
# $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/hsc2hs/
# $(INSTALL_DATA) hsc2hs.sh $(BIN_DIST_DIR)/utils/hsc2hs/
# $(INSTALL_DATA) $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
# $(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/hsc2hs/
include $(TOP)/mk/cabal.mk
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment