aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Hengel <sol@typeful.net>2014-08-22 12:14:16 +0800
committerSimon Hengel <sol@typeful.net>2014-08-22 12:14:16 +0800
commite99252026ad1b50215b86ffe30038351ca486bfa (patch)
treed0a88fd913edd590fefb952d635871f11afda41b /src
parent2c3f2b47fa5e66f5503b5418415e2fa75d134689 (diff)
Move Haddock API to a separate package
Diffstat (limited to 'src')
-rw-r--r--src/Haddock.hs3
-rw-r--r--src/Haddock/Version.hs9
2 files changed, 9 insertions, 3 deletions
diff --git a/src/Haddock.hs b/src/Haddock.hs
index 3d049b18..ad78c50d 100644
--- a/src/Haddock.hs
+++ b/src/Haddock.hs
@@ -19,7 +19,6 @@
-----------------------------------------------------------------------------
module Haddock (haddock, readPackagesAndProcessModules, withGhc') where
-
import Haddock.Backends.Xhtml
import Haddock.Backends.Xhtml.Themes (getThemes)
import Haddock.Backends.LaTeX
@@ -54,7 +53,7 @@ import Data.Int
import System.FilePath
#else
import qualified GHC.Paths as GhcPaths
-import Paths_haddock
+import Paths_haddock_api (getDataDir)
#endif
import GHC hiding (verbosity)
diff --git a/src/Haddock/Version.hs b/src/Haddock/Version.hs
index f4729c7d..2ef3a257 100644
--- a/src/Haddock/Version.hs
+++ b/src/Haddock/Version.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
-----------------------------------------------------------------------------
-- |
-- Module : Haddock.Version
@@ -12,11 +13,17 @@ module Haddock.Version (
projectName, projectVersion, projectUrl
) where
+#ifdef IN_GHC_TREE
import Paths_haddock ( version )
+#else
+import Paths_haddock_api ( version )
+#endif
import Data.Version ( showVersion )
-projectName, projectUrl :: String
+projectName :: String
projectName = "Haddock"
+
+projectUrl :: String
projectUrl = "http://www.haskell.org/haddock/"
projectVersion :: String