[Pkg-haskell-commits] darcs: ghc: Fix debian/patches/haddock-hardcode-ghc-paths

[Joachim Breitner]

Tue Dec 11 22:39:44 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Fix debian/patches/haddock-hardcode-ghc-paths
  Ignore-this: 2b04cd502b9530c69cc9a3ae1e058751

    M ./patches/haddock-hardcode-ghc-paths -2 +31

Tue Dec 11 22:39:44 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Fix debian/patches/haddock-hardcode-ghc-paths
  Ignore-this: 2b04cd502b9530c69cc9a3ae1e058751
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-12-12 16:53:38.878734202 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths	2012-12-12 16:53:38.902721443 +0000
@@ -1,7 +1,7 @@
 Index: ghc-7.6.1.20121207/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.6.1.20121207.orig/utils/haddock/haddock.cabal	2012-12-08 19:10:11.000000000 +0100
-+++ ghc-7.6.1.20121207/utils/haddock/haddock.cabal	2012-12-10 19:02:01.388679034 +0100
+--- ghc-7.6.1.20121207.orig/utils/haddock/haddock.cabal	2012-12-11 23:38:48.259705093 +0100
++++ ghc-7.6.1.20121207/utils/haddock/haddock.cabal	2012-12-11 23:38:54.615704866 +0100
 @@ -118,10 +118,6 @@
  
  library
@@ -22,3 +22,32 @@
  
    hs-source-dirs:       src
    if flag(dev)
+Index: ghc-7.6.1.20121207/utils/haddock/src/Haddock.hs
+===================================================================
+--- ghc-7.6.1.20121207.orig/utils/haddock/src/Haddock.hs	2012-12-11 23:38:45.183705205 +0100
++++ ghc-7.6.1.20121207/utils/haddock/src/Haddock.hs	2012-12-11 23:38:54.615704866 +0100
+@@ -50,7 +50,6 @@
+ #ifdef IN_GHC_TREE
+ import System.FilePath
+ #else
+-import qualified GHC.Paths as GhcPaths
+ import Paths_haddock
+ #endif
+ 
+@@ -349,14 +348,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
+     ghcPath = "not available"
+ #else
+-    ghcPath = GhcPaths.ghc
++    ghcPath = "/usr/bin/ghc"
+ #endif
+ 
+