diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-05-14 10:15:45 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-05-14 10:15:45 +0200 |
| commit | c277db2271e22e3b8fa1afeaf42ffc6988a48720 (patch) | |
| tree | c498625fcf269851ee409a28abb006ac6673f384 | |
| parent | 261342e47efc2756c6befd1e3d83c42d5dd082c6 (diff) | |
| parent | 26e6b39de3213969d7de7f8bb3d4a849136866d1 (diff) | |
Merge remote-tracking branch 'origin/master' into ghc-head
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | doc/ghc.mk | 2 | ||||
| -rw-r--r-- | haddock-api/haddock-api.cabal | 2 | ||||
| -rw-r--r-- | haddock.cabal | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -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 @@ -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 |