From 7af057eb018fd4fc045509c3ae7ba31c8c9321cc Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Sat, 16 Jun 2012 10:48:18 +0000 Subject: [PATCH] haddock-hardcode-ghc-paths =================================================================== Gbp-Pq: Name haddock-hardcode-ghc-paths --- utils/haddock/haddock.cabal | 8 -------- utils/haddock/src/Main.hs | 5 ++--- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/utils/haddock/haddock.cabal b/utils/haddock/haddock.cabal index 84d3c2a8..8c3520e3 100644 --- a/utils/haddock/haddock.cabal +++ b/utils/haddock/haddock.cabal @@ -78,10 +78,6 @@ flag test executable haddock default-language: Haskell2010 - -- In a GHC tree - in particular, in a source tarball - we don't - -- require alex or happy - if !flag(in-ghc-tree) - build-tools: alex >= 2.3, happy >= 1.18 build-depends: base >= 4.3 && < 4.6, filepath, @@ -95,8 +91,6 @@ executable haddock if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE - else - build-depends: ghc-paths if flag(test) cpp-options: -DTEST @@ -157,8 +151,6 @@ library if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE - else - build-depends: ghc-paths if flag(test) cpp-options: -DTEST diff --git a/utils/haddock/src/Main.hs b/utils/haddock/src/Main.hs index 0a3c9ffc..575afd0d 100644 --- a/utils/haddock/src/Main.hs +++ b/utils/haddock/src/Main.hs @@ -50,7 +50,6 @@ import Data.Int #ifdef IN_GHC_TREE import System.FilePath #else -import qualified GHC.Paths as GhcPaths import Paths_haddock #endif @@ -344,14 +343,14 @@ getGhcDirs flags = do 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" #endif -- 2.30.2