Mon Nov 20 21:02:11 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,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/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
Link       : http://git.haskell.org/haddock.git/commitdiff/26e6b39de3213969d7de7f8bb3d4a849136866d1

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

commit 26e6b39de3213969d7de7f8bb3d4a849136866d1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat May 14 09:52:25 2016 +0200

    doc: Use `$(MAKE)` instead of `make`
    
    This is necessary to ensure we use gmake.


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

26e6b39de3213969d7de7f8bb3d4a849136866d1
 CHANGES    | 2 +-
 doc/ghc.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3875c3a..d450cff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Changes in version 2.17.2
 
- * TODO
+ * Fix portability of documentation building within GHC
 
 Changes in version 2.17.1
 
diff --git a/doc/ghc.mk b/doc/ghc.mk
index 3e53168..afa3f07 100644
--- a/doc/ghc.mk
+++ b/doc/ghc.mk
@@ -19,6 +19,6 @@ INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock
 endif
 
 html_utils/haddock/doc :
-	make -C utils/haddock/doc html SPHINX_BUILD=$(SPHINXBUILD)
+	$(MAKE) -C utils/haddock/doc html SPHINX_BUILD=$(SPHINXBUILD)
 	cp -R utils/haddock/doc/.build-html utils/haddock/doc/haddock
 

