From 1e22c3c690238ef04908f7a5117b990710dce38f Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Fri, 18 Jul 2008 15:39:56 +0000
Subject: [PATCH] Tweak the build system for installPackage

---
 utils/Makefile                |    6 +++---
 utils/installPackage/Makefile |   34 +---------------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/utils/Makefile b/utils/Makefile
index 9f2b1b0..e101e50 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 0397035..0f34de9 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
 
-- 
1.7.10.4