Commit 388448bc authored by thomie's avatar thomie

Build system: don't install haddock .t files (#10410)

When generating a haddock .t file for a library, don't save it in the
`dist-install/doc` directory for that library, as then it gets copied to
the installation directory during `make install` by `ghc-cabal copy`.
Instead, save it a few directories up; putting it next to
`haddock-prologue.txt` seemed appropriate.

Test Plan: run `make` in `tests/perf/haddock`.

Differential Revision: https://phabricator.haskell.org/D903
parent 71d1f01d
......@@ -61,7 +61,7 @@ endif
$$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS) \
$$($1_$2_HS_SRCS) \
$$($1_$2_EXTRA_HADDOCK_SRCS) \
+RTS -t$$@.t --machine-readable
+RTS -t"$1/$2/haddock.t" --machine-readable
# --no-tmp-comp-dir above is important: it saves a few minutes in a
# validate. This flag lets Haddock use the pre-compiled object files
......
......@@ -40,7 +40,7 @@ test('haddock.base',
# 2014-08-05: XXX TODO UPDATE ME XXX
],
stats,
['../../../../libraries/base/dist-install/doc/html/base/base.haddock.t'])
['../../../../libraries/base/dist-install/haddock.t'])
test('haddock.Cabal',
[unless(in_tree_compiler(), skip), req_haddock
......@@ -81,7 +81,7 @@ test('haddock.Cabal',
# 2014-08-05: XXX TODO UPDATE ME XXX
],
stats,
['../../../../libraries/Cabal/Cabal/dist-install/doc/html/Cabal/Cabal.haddock.t'])
['../../../../libraries/Cabal/Cabal/dist-install/haddock.t'])
test('haddock.compiler',
[unless(in_tree_compiler(), skip), req_haddock
......@@ -109,4 +109,4 @@ test('haddock.compiler',
# 2014-06-29: 15110426000 (x86/Linux)
],
stats,
['../../../../compiler/stage2/doc/html/ghc/ghc.haddock.t'])
['../../../../compiler/stage2/haddock.t'])
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment