From 0f346e69483554a0b144710450b067c7f6fadc9e Mon Sep 17 00:00:00 2001
From: Thomas Schilling <nominolo@googlemail.com>
Date: Mon, 8 Dec 2008 18:03:18 +0000
Subject: [PATCH] Add 'cabal-install' make target and some more Makefile fixes.

---
 Makefile         | 22 +++++++++++++++++-----
 config.mk.sample |  7 +++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index c74c2eb..ccf04fd 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ SETUP_DIST = setup-dist
 SETUP_CONFIG = $(DIST)/setup-config
 SETUP = $(SETUP_DIST)/Setup
 
+CABAL_INSTALL_OPTS += --ghc --with-compiler=$(HC) --with-hc-pkg=$(PKG)
+
 main: build
 
 setup: $(SETUP)
@@ -33,7 +35,7 @@ test: build
 #	./dist/build/test_get_imports/test_get_imports $(GHC_PATH)/compiler dist-stage2 +RTS -s -RTS
 
 clean:
-	$(SETUP) clean
+	$(SETUP) clean || rm -rf $(DIST)
 
 distclean: clean
 	rm -rf $(SETUP_DIST)
@@ -42,7 +44,17 @@ doc:
 	$(SETUP) haddock --with-haddock=$(HADDOCK)
 
 printvars:
-	@echo "GHC_PATH = $(GHC_PATH)"
-	@echo "HC       = $(HC)"
-	@echo "PKG      = $(PKG)"
-	@echo "HADDOCK  = $(HADDOCK)"
\ No newline at end of file
+	@echo "UseInplaceGhc    = $(UseInplaceGhc)"
+	@echo "GHC_PATH         = $(GHC_PATH)"
+	@echo "HC               = $(HC)"
+	@echo "PKG              = $(PKG)"
+	@echo "HADDOCK          = $(HADDOCK)"
+	@echo "CABAL_INSTALL    = $(CABAL_INSTALL)"
+	@echo "        ..._OPTS = $(CABAL_INSTALL_OPTS)"
+	@echo "---------------------------------------------------------------"
+	@echo "DIST         = $(DIST)"
+	@echo "SETUP_CONFIG = $(SETUP_CONFIG)"
+	@echo "SETUP_DIST   = $(SETUP_DIST)"
+
+cabal-install:
+	$(CABAL_INSTALL) install $(CABAL_INSTALL_OPTS)
diff --git a/config.mk.sample b/config.mk.sample
index 245fa50..1a4d72f 100644
--- a/config.mk.sample
+++ b/config.mk.sample
@@ -4,13 +4,13 @@
 # As Scion depends on features or bugfixes of GHC's HEAD branch, by
 # default we assume that we use an inplace GHC.
 
-UseInplaceGhc = "NO"
+UseInplaceGhc = NO
 
 # ----------------------------------------------------------------------
 
 ifeq "$(UseInplaceGhc)" "YES"
 
-GHC_PATH = ../ghc
+GHC_PATH = /absolute/path/to/ghc
 
 else
 
@@ -19,3 +19,6 @@ PKG     = ghc-pkg
 HADDOCK = haddock
 
 endif
+
+# path to 'cabal' program from the 'cabal-install' tool.
+CABAL_INSTALL = cabal