From eb39f720c731b10b340ebadc809d91f9683ea157 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sun, 4 Jul 2010 13:26:12 +0000
Subject: Use Cabal to configure the dist-install ghc-pkg; fixes trac #4156

---
 utils/ghc-pkg/ghc-pkg.cabal | 14 ++++++++++----
 utils/ghc-pkg/ghc.mk        |  8 +++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'utils')

diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal
index 0b8bb37e10..6be5ce6bd9 100644
--- a/utils/ghc-pkg/ghc-pkg.cabal
+++ b/utils/ghc-pkg/ghc-pkg.cabal
@@ -21,6 +21,7 @@ Flag base3
 
 Executable ghc-pkg
     Main-Is: Main.hs
+    Other-Modules: Version
     Extensions: CPP, ForeignFunctionInterface
 
     if flag(base4)
@@ -32,14 +33,19 @@ Executable ghc-pkg
 
     if flag(base3) || flag(base4)
         Build-Depends: directory  >= 1   && < 1.1,
-                       process    >= 1   && < 1.1,
-                       pretty     >= 1   && < 1.1
+                       process    >= 1   && < 1.1
 
     if impl(ghc < 6.9)
         Build-Depends: extensible-exceptions
 
-    Build-Depends: haskell98, filepath, Cabal, bin-package-db
+    Build-Depends: haskell98,
+                   filepath,
+                   Cabal,
+                   binary,
+                   bin-package-db,
+                   bytestring
     if !os(windows)
-        Build-Depends: unix
+        Build-Depends: unix,
+                       terminfo
     if os(windows)
         c-sources: CRT_noglob.c
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index d45ebacd5e..e9fe119ad4 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -78,12 +78,10 @@ $(eval $(call clean-target,utils/ghc-pkg,dist,\
 # -----------------------------------------------------------------------------
 # Building ghc-pkg with stage 1
 
+utils/ghc-pkg_dist-install_USES_CABAL = YES
+utils/ghc-pkg_PACKAGE = ghc-pkg
+
 utils/ghc-pkg_dist-install_PROG = ghc-pkg
-utils/ghc-pkg_dist-install_MODULES = Main Version
-utils/ghc-pkg_dist-install_DEPS = Cabal bin-package-db
-ifeq "$(Windows)" "NO"
-utils/ghc-pkg_dist-install_DEPS += terminfo
-endif
 utils/ghc-pkg_dist-install_SHELL_WRAPPER = YES
 utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER = YES
 utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion)
-- 
cgit v1.2.1