diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-18 15:39:56 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-18 15:39:56 +0000 |
| commit | 1e22c3c690238ef04908f7a5117b990710dce38f (patch) | |
| tree | 5ca20567731d11906a80d595c989797132d48083 /utils | |
| parent | 4d7ecf304ab398c4aed110822cd934cb6dc071e3 (diff) | |
| download | haskell-1e22c3c690238ef04908f7a5117b990710dce38f.tar.gz | |
Tweak the build system for installPackage
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 6 | ||||
| -rw-r--r-- | utils/installPackage/Makefile | 34 |
2 files changed, 4 insertions, 36 deletions
diff --git a/utils/Makefile b/utils/Makefile index 9f2b1b05d1..e101e504df 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -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 diff --git a/utils/installPackage/Makefile b/utils/installPackage/Makefile index 0397035d64..0f34de9174 100644 --- a/utils/installPackage/Makefile +++ b/utils/installPackage/Makefile @@ -1,37 +1,5 @@ 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 |