[commit: Cabal] master: Minor tweaks in haddock code (dfc473a)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/dfc473ae87352eade3db4d553b5da62c1f8ba6ca

>---------------------------------------------------------------

commit dfc473ae87352eade3db4d553b5da62c1f8ba6ca
Author: Duncan Coutts <duncan at haskell.org>
Date:   Fri May 28 20:03:26 2010 +0000

    Minor tweaks in haddock code

>---------------------------------------------------------------

 cabal-install/Distribution/Client/Haddock.hs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cabal-install/Distribution/Client/Haddock.hs b/cabal-install/Distribution/Client/Haddock.hs
index 8f1b992..72cebc5 100644
--- a/cabal-install/Distribution/Client/Haddock.hs
+++ b/cabal-install/Distribution/Client/Haddock.hs
@@ -52,10 +52,14 @@ regenerateHaddockIndex verbosity pkgs conf index = do
 
       createDirectoryIfMissing True destDir
 
-      withTempDirectory verbosity destDir "htemp" $ \tempDir -> do
+      withTempDirectory verbosity destDir "tmphaddock" $ \tempDir -> do
 
-        let flags = ["--gen-contents", "--gen-index", "--odir="++tempDir] 
-                    ++ map (\(i,h) -> "--read-interface=" ++ h ++ "," ++ i) paths
+        let flags = [ "--gen-contents"
+                    , "--gen-index"
+                    , "--odir=" ++ tempDir
+                    , "--title=Haskell modules on this system" ]
+                 ++ [ "--read-interface=" ++ html ++ "," ++ interface
+                    | (interface, html) <- paths ]
         rawSystemProgram verbosity confHaddock flags
         renameFile (tempDir </> "index.html") (tempDir </> destFile)
         installDirectoryContents verbosity tempDir destDir
@@ -71,7 +75,7 @@ regenerateHaddockIndex verbosity pkgs conf index = do
             $ pkgs
 
 haddockPackagePaths :: [InstalledPackageInfo]
-                       -> IO ([(FilePath, FilePath)], Maybe [Char])
+                       -> IO ([(FilePath, FilePath)], Maybe String)
 haddockPackagePaths pkgs = do
   interfaces <- sequence
     [ case interfaceAndHtmlPath pkg of