From 611a30585cb6ee482bfd0eeb2c0feb9e678325fd Mon Sep 17 00:00:00 2001
From: Simon Marlow <marlowsd@gmail.com>
Date: Tue, 24 Mar 2009 11:04:31 +0000
Subject: update for new GHC build system layout

---
 ghc.mk      | 2 +-
 src/Main.hs | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 054f780c..7020834c 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -3,7 +3,7 @@ utils/haddock_USES_CABAL = YES
 utils/haddock_PACKAGE = haddock
 utils/haddock_CONFIGURE_OPTS = --flag in-ghc-tree
 # XXX This is a temporary hack:
-utils/haddock_HC_OPTS += -Wwarn
+utils/haddock_HC_OPTS += -Wwarn -DNEW_GHC_LAYOUT
 utils/haddock_dist_SHELL_WRAPPER = YES
 utils/haddock_dist_INSTALL_SHELL_WRAPPER = YES
 utils/haddock_dist_PROG = haddock$(exeext)
diff --git a/src/Main.hs b/src/Main.hs
index cde7790c..c4b916b6 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -156,7 +156,11 @@ main = handleTopExceptions $ do
                     do m <- getExecDir
                        case m of
                            Nothing -> error "No GhcLibDir found"
+#ifdef NEW_GHC_LAYOUT
+                           Just d -> return (d </> ".." </> "lib")
+#else
                            Just d -> return (d </> "..")
+#endif
 #else
                     return libdir -- from GHC.Paths
 #endif
@@ -237,7 +241,11 @@ render flags ifaces installedIfaces = do
                       do m <- getExecDir
                          case m of
                              Nothing -> error "No libdir found"
+#ifdef NEW_GHC_LAYOUT
+                             Just d -> return (d </> ".." </> "lib")
+#else
                              Just d -> return (d </> "..")
+#endif
 #else
                       getDataDir -- provided by Cabal
 #endif
-- 
cgit v1.2.3