[commit: ghc] wip/nfs-locking: Add an explicit dependency on pkgDataFile to make sure GhcCabal hscolour is run after GhcCabal configure. (0c9d7d8)

[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/0c9d7d887552956816e5acee725dbc79f591b18d/ghc

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

commit 0c9d7d887552956816e5acee725dbc79f591b18d
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Dec 20 20:58:10 2015 +0000

    Add an explicit dependency on pkgDataFile to make sure GhcCabal hscolour is run after GhcCabal configure.


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

0c9d7d887552956816e5acee725dbc79f591b18d
 src/Rules/Documentation.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Rules/Documentation.hs b/src/Rules/Documentation.hs
index 495a16c..463552f 100644
--- a/src/Rules/Documentation.hs
+++ b/src/Rules/Documentation.hs
@@ -10,9 +10,9 @@ import Settings
 -- All of them go into the 'doc' subdirectory. Pedantically tracking all built
 -- files in the Shake databases seems fragile and unnecesarry.
 buildPackageDocumentation :: Resources -> PartialTarget -> Rules ()
-buildPackageDocumentation _ target @ (PartialTarget stage package) =
-    let cabalFile   = pkgCabalFile package
-        haddockFile = pkgHaddockFile package
+buildPackageDocumentation _ target @ (PartialTarget stage pkg) =
+    let cabalFile   = pkgCabalFile pkg
+        haddockFile = pkgHaddockFile pkg
     in when (stage == Stage1) $ do
         haddockFile %> \file -> do
             srcs <- interpretPartial target getPackageSources
@@ -23,7 +23,7 @@ buildPackageDocumentation _ target @ (PartialTarget stage package) =
 
             -- HsColour sources
             whenM (specified HsColour) $ do
-                need [cabalFile]
+                need [cabalFile, pkgDataFile stage pkg ]
                 build $ fullTarget target GhcCabalHsColour [cabalFile] []
 
             -- Build Haddock documentation