Update Haddock file refs

Stackage/Test.hs

@@ -232,6 +232,7 @@ runTestSuite cabalVersion settings testdir docdir
                 : "--hyperlink-source"
                 : "--html"
                 : "--hoogle"
+                -- FIXME is this redundant with read-interface above?
                 : "--html-location=../$pkg-$version/"
                 : hfsOpts) dir
             let PackageName packageName' = packageName

Stackage2/PerformBuild.hs

@@ -309,15 +309,16 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
                     (childDir </> "dist" </> "doc" </> "html" </> fpFromText name)
                     (pbDocDir pb </> fpFromText namever)
 
-                {-
                 enewPath <- tryIO
                           $ canonicalizePath
-                          $ docdir </> package </> packageName' <.> "haddock"
+                          $ pbDocDir pb
+                        </> fpFromText namever
+                        </> fpFromText name <.> "haddock"
                 case enewPath of
-                    Left _ -> return () -- print e
+                    Left e -> warn $ tshow e
-                    Right newPath -> atomicModifyIORef haddockFilesRef $ \hfs'
+                    Right newPath -> atomically
-                        -> ((package, newPath) : hfs', ())
+                                   $ modifyTVar sbHaddockFiles
-                        -}
+                                   $ insertMap namever newPath
 
             case (eres, pcHaddocks) of
                 (Left e, ExpectSuccess) -> throwM e
@@ -345,7 +346,12 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
 
     warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
 
-    updateErrs exc =
+    updateErrs exc = do
+        log' $ concat
+            [ display (piName sbPackageInfo)
+            , ": "
+            , tshow exc
+            ]
         atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
       where
         exc' =