[commit: ghc] wip/nfs-locking: Fix Haddock arguments. (bf86f0e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/bf86f0ec66186df924ba0e173ba606fe39ddbf1b/ghc

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

commit bf86f0ec66186df924ba0e173ba606fe39ddbf1b
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Aug 22 00:26:44 2015 +0100

    Fix Haddock arguments.


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

bf86f0ec66186df924ba0e173ba606fe39ddbf1b
 src/Settings/Builders/Haddock.hs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Settings/Builders/Haddock.hs b/src/Settings/Builders/Haddock.hs
index 19c1979..0e839ce 100644
--- a/src/Settings/Builders/Haddock.hs
+++ b/src/Settings/Builders/Haddock.hs
@@ -26,6 +26,7 @@ haddockArgs = builder Haddock ? do
     ghcOpts  <- fromDiffExpr commonGhcArgs
     mconcat
         [ arg $ "--odir=" ++ takeDirectory file
+        , arg "--verbosity=0"
         , arg "--no-tmp-comp-dir"
         , arg $ "--dump-interface=" ++ file
         , arg "--html"
@@ -39,12 +40,14 @@ haddockArgs = builder Haddock ? do
                    | (dep, depName) <- zip deps depNames
                    , Just depPkg <- [findKnownPackage depName] ]
         , append [ "--optghc=" ++ opt | opt <- ghcOpts ]
-        , arg "--source-module=src/%{MODULE/./-}.html"
-        , arg "--source-entity=src/%{MODULE/./-}.html\\#%{NAME}"
+        , specified HsColour ?
+          arg "--source-module=src/%{MODULE/./-}.html"
+        , specified HsColour ?
+          arg "--source-entity=src/%{MODULE/./-}.html\\#%{NAME}"
         , customPackageArgs
         , append srcs
         , arg "+RTS"
-        , arg $ "-t" ++ file <.> "t"
+        , arg $ "-t" ++ path </> "haddock.t"
         , arg "--machine-readable" ]
 
 customPackageArgs :: Args