rpms/haddock/devel haddock-2.4.1-no-ghc-paths.patch,NONE,1.1

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/haddock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6896

Added Files:
	haddock-2.4.1-no-ghc-paths.patch 
Log Message:
add the patch

haddock-2.4.1-no-ghc-paths.patch:

--- NEW FILE haddock-2.4.1-no-ghc-paths.patch ---
diff -up haddock-2.4.1/haddock.cabal.orig haddock-2.4.1/haddock.cabal
--- haddock-2.4.1/haddock.cabal.orig	2008-11-07 07:14:17.000000000 +1000
+++ haddock-2.4.1/haddock.cabal	2008-12-05 18:08:55.000000000 +1000
@@ -76,8 +76,6 @@ executable haddock
   if flag(in-ghc-tree)
     cpp-options: -DIN_GHC_TREE
     extensions: ForeignFunctionInterface
-  else
-    build-depends: ghc-paths
 
   if impl(ghc >= 6.9)
     build-depends: Cabal >= 1.5
diff -up haddock-2.4.1/src/Main.hs.orig haddock-2.4.1/src/Main.hs
--- haddock-2.4.1/src/Main.hs.orig	2008-11-07 07:14:16.000000000 +1000
+++ haddock-2.4.1/src/Main.hs	2008-12-05 18:14:02.000000000 +1000
@@ -47,10 +47,6 @@ import Foreign.C
 import Data.Int
 #endif
 
-#ifndef IN_GHC_TREE
-import GHC.Paths
-#endif
-
 import GHC
 import DynFlags
 import Bag
@@ -156,7 +152,7 @@ main = handleTopExceptions $ do
                            Nothing -> error "No GhcLibDir found"
                            Just d -> return (d </> "..")
 #else
-                    return libdir -- from GHC.Paths
+                    return "@GHCLIBDIR@" -- from GHC.Paths
 #endif
 
 #if __GLASGOW_HASKELL__ >= 609