Merge remote-tracking branch 'origin/master' into ghc-head

2 files changed, 11 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index f3b90e98..f27d151c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,13 @@
-Changes in version 2.17.0
+Changes in version 2.17.1
 
  * Included with GHC 8.0.1
 
+ * Fixed Makefile for GHC installation
+
+ * Fixed clean rule of GHC Makefile
+
+Changes in version 2.17.0 (not released)
+
  * Support typesetting of mathematical expressions via Mathjax (#397)
 
  * Describe orphan instances defined in a module in its documentation (#449)
diff --git a/doc/ghc.mk b/doc/ghc.mk
index 590d1c5f..3e53168e 100644
--- a/doc/ghc.mk
+++ b/doc/ghc.mk
@@ -11,9 +11,11 @@
 # -----------------------------------------------------------------------------
 
 ifeq "$(BUILD_SPHINX_HTML)" "YES"
-INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock
-
 html : html_utils/haddock/doc
+
+$(eval $(call clean-target,utils/haddock/doc,sphinx,utils/haddock/doc/haddock utils/haddock/doc/.build-html utils/haddock/doc/.build-pdf))
+$(eval $(call all-target,utils/haddock/doc,html_utils/haddock/doc))
+INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock
 endif
 
 html_utils/haddock/doc :