[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: At long last fix ghc.mk (fea4b0a)

git at git.haskell.org git at git.haskell.org
Tue Nov 28 11:45:27 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/fea4b0a3589ad67d72594b16ceb0e6922e7f2bb8

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

commit fea4b0a3589ad67d72594b16ceb0e6922e7f2bb8
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun May 1 13:15:34 2016 +0200

    doc: At long last fix ghc.mk
    
    The variable reference was incorrectly escaped, meaning that Sphinx
    documentation was never installed.
    
    (cherry picked from commit 609018dd09c4ffe27f9248b2d8b50f6196cd42b9)


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

fea4b0a3589ad67d72594b16ceb0e6922e7f2bb8
 doc/ghc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ghc.mk b/doc/ghc.mk
index ca63957..590d1c5 100644
--- a/doc/ghc.mk
+++ b/doc/ghc.mk
@@ -10,11 +10,11 @@
 #
 # -----------------------------------------------------------------------------
 
-ifeq "$$(BUILD_SPHINX_HTML)" "YES"
+ifeq "$(BUILD_SPHINX_HTML)" "YES"
 INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock
-endif
 
 html : html_utils/haddock/doc
+endif
 
 html_utils/haddock/doc :
 	make -C utils/haddock/doc html SPHINX_BUILD=$(SPHINXBUILD)



More information about the ghc-commits mailing list