[commit: haddock] 2.17.3.1-spanfix, alexbiehl-patch-1, ghc-8.0, ghc-8.0-facebook, ghc-head, ghc-head1, haddock-quick, headdock-library-1.4.5, ie_avails, issue-303, master, pr-filter-maps, pr/cabal-desc, travis, v2.17, v2.17.3, v2.18, wip-located-module-as, wip/D2418, wip/T12105, wip/T12105-2, wip/T12942, wip/T13163, wip/T14529, wip/T3384, wip/embelleshed-rdr, wip/new-tree-one-param, wip/rae, wip/remove-frames, wip/remove-frames1, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: doc: Only install if BUILD_SPHINX_HTML==YES (ea63a59)

git at git.haskell.org git at git.haskell.org
Tue Nov 28 11:45:05 UTC 2017


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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/ea63a59882c6d1ecd5e4147d3500d664c9431dd8

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

commit ea63a59882c6d1ecd5e4147d3500d664c9431dd8
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Apr 10 19:31:39 2016 +0200

    doc: Only install if BUILD_SPHINX_HTML==YES
    
    Fixes GHC #11818.
    
    (cherry picked from commit c6d6a18d85e5e2d9bb5904e6919e8a8d7e31c4c5)


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

ea63a59882c6d1ecd5e4147d3500d664c9431dd8
 doc/ghc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ghc.mk b/doc/ghc.mk
index 52a2f2a..ca63957 100644
--- a/doc/ghc.mk
+++ b/doc/ghc.mk
@@ -10,7 +10,9 @@
 #
 # -----------------------------------------------------------------------------
 
+ifeq "$$(BUILD_SPHINX_HTML)" "YES"
 INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock
+endif
 
 html : html_utils/haddock/doc
 



More information about the ghc-commits mailing list