From: simonmar <unknown>
Date: Mon, 9 Sep 2002 12:10:01 +0000 (+0000)
Subject: [project @ 2002-09-09 12:10:01 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~1703
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=519a0b70ea0d98c3718d89f81e721b1ea66e709a;p=ghc-hetmet.git

[project @ 2002-09-09 12:10:01 by simonmar]
Urk, the 'import Pretty' in this module was a bit of a hack; when
compiled as part of the standalone ghc-pkg tool it referred to the
Pretty library from the util package, but when compiled as part of the
compiler it referred to the compiler's own Pretty module.  Hack around
this.
---

diff --git a/ghc/utils/ghc-pkg/Package.hs b/ghc/utils/ghc-pkg/Package.hs
index 85855b7..2fb7690 100644
--- a/ghc/utils/ghc-pkg/Package.hs
+++ b/ghc/utils/ghc-pkg/Package.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: Package.hs,v 1.4 2002/09/09 11:32:38 simonmar Exp $
+-- $Id: Package.hs,v 1.5 2002/09/09 12:10:01 simonmar Exp $
 --
 -- Package configuration defn.
 -----------------------------------------------------------------------------
@@ -17,7 +17,7 @@ module Package (
 #endif
 
 #ifdef WANT_PRETTY
-#if __GLASGOW_HASKELL__ >= 504
+#if __GLASGOW_HASKELL__ >= 504 && !defined(INTERNAL_PRETTY)
 import Text.PrettyPrint
 #else
 import Pretty