aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--doc/ghc.mk2
-rw-r--r--haddock-api/haddock-api.cabal2
-rw-r--r--haddock.cabal2
4 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index f27d151c..d450cff5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Changes in version 2.17.2
+
+ * Fix portability of documentation building within GHC
+
Changes in version 2.17.1
* Included with GHC 8.0.1
diff --git a/doc/ghc.mk b/doc/ghc.mk
index 3e53168e..afa3f078 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
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index cd7a0aa4..6c98fcfb 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -1,5 +1,5 @@
name: haddock-api
-version: 2.17.1
+version: 2.17.2
synopsis: A documentation-generation tool for Haskell libraries
description: Haddock is a documentation-generation tool for Haskell
libraries
diff --git a/haddock.cabal b/haddock.cabal
index 4e335d06..7a2e0a04 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
name: haddock
-version: 2.17.1
+version: 2.17.2
synopsis: A documentation-generation tool for Haskell libraries
description: Haddock is a documentation-generation tool for Haskell
libraries