[Pkg-haskell-commits] darcs: ghc: Refresh haddock-hardcode-ghc-paths (what is GhcPaths.ghc?)

[Joachim Breitner]

Wed Dec 21 18:51:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh haddock-hardcode-ghc-paths (what is GhcPaths.ghc?)
  Ignore-this: 853f66babe4ee1056d2d6f5d1b7ffb56

    M ./patches/haddock-hardcode-ghc-paths -14 +22

Wed Dec 21 18:51:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh haddock-hardcode-ghc-paths (what is GhcPaths.ghc?)
  Ignore-this: 853f66babe4ee1056d2d6f5d1b7ffb56
diff -rN -u old-ghc//patches/haddock-hardcode-ghc-paths new-ghc//patches/haddock-hardcode-ghc-paths
--- old-ghc//patches/haddock-hardcode-ghc-paths	2012-02-03 16:43:39.207265022 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths	2012-02-03 16:43:40.179248881 +0000
@@ -1,8 +1,8 @@
-Index: ghc-7.2.2/utils/haddock/haddock.cabal
+Index: ghc-7.4.0.20111219/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.2.2.orig/utils/haddock/haddock.cabal	2011-11-09 19:11:26.000000000 +0100
-+++ ghc-7.2.2/utils/haddock/haddock.cabal	2011-11-19 18:25:55.000000000 +0100
-@@ -91,8 +91,6 @@
+--- ghc-7.4.0.20111219.orig/utils/haddock/haddock.cabal	2011-12-19 19:11:30.000000000 +0100
++++ ghc-7.4.0.20111219/utils/haddock/haddock.cabal	2011-12-21 19:46:02.000000000 +0100
+@@ -95,8 +95,6 @@
  
    if flag(in-ghc-tree)
      cpp-options: -DIN_GHC_TREE
@@ -11,7 +11,7 @@
  
    if flag(test)
      cpp-options: -DTEST
-@@ -151,8 +149,6 @@
+@@ -158,8 +156,6 @@
  
    if flag(in-ghc-tree)
      cpp-options: -DIN_GHC_TREE
@@ -20,24 +20,32 @@
  
    if flag(test)
      cpp-options: -DTEST
-Index: ghc-7.2.2/utils/haddock/src/Main.hs
+Index: ghc-7.4.0.20111219/utils/haddock/src/Main.hs
 ===================================================================
---- ghc-7.2.2.orig/utils/haddock/src/Main.hs	2011-11-09 19:11:26.000000000 +0100
-+++ ghc-7.2.2/utils/haddock/src/Main.hs	2011-11-19 18:25:55.000000000 +0100
+--- ghc-7.4.0.20111219.orig/utils/haddock/src/Main.hs	2011-12-19 19:11:30.000000000 +0100
++++ ghc-7.4.0.20111219/utils/haddock/src/Main.hs	2011-12-21 19:50:41.000000000 +0100
 @@ -50,7 +50,6 @@
  #ifdef IN_GHC_TREE
  import System.FilePath
  #else
--import GHC.Paths
+-import qualified GHC.Paths as GhcPaths
  import Paths_haddock
  #endif
  
-@@ -341,7 +340,7 @@
+@@ -344,14 +343,14 @@
+       libDir <- getInTreeDir
+       return (ghcPath, libDir)
+ #else
+-      return (ghcPath, GhcPaths.libdir)
++      return (ghcPath, "/usr/lib/ghc")
+ #endif
+     xs -> return (ghcPath, last xs)
+   where
  #ifdef IN_GHC_TREE
-       getInTreeLibDir
+     ghcPath = "not available"
  #else
--      return libdir -- from GHC.Paths
-+      return "/usr/lib/ghc/"
+-    ghcPath = GhcPaths.ghc
++    ghcPath = "/usr"
  #endif
-     xs -> return $ last xs
+