From 22d1666f864a8c3a718a615ed5b7b88647525caf Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 11 May 2016 20:38:58 +0200 Subject: doc: Add clean targets --- doc/ghc.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/ghc.mk b/doc/ghc.mk index 590d1c5f..02839fe8 100644 --- a/doc/ghc.mk +++ b/doc/ghc.mk @@ -14,6 +14,8 @@ 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-*)) endif html_utils/haddock/doc : -- cgit v1.2.3 From 3e087827207f53bc151fe410ef195d1399dcaf22 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 11 May 2016 22:25:46 +0200 Subject: doc: Add html as an all-target for ghc Otherwise the html documentation won't be installed for binary-dist. --- doc/ghc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/ghc.mk b/doc/ghc.mk index 02839fe8..830c3bbc 100644 --- a/doc/ghc.mk +++ b/doc/ghc.mk @@ -11,11 +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-*)) +$(eval $(call all-target,utils/haddock/doc,html_utils/haddock/doc)) +INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock endif html_utils/haddock/doc : -- cgit v1.2.3 From af1a8689da1990da9a152ae8a0e51976f2a27ff6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 12 May 2016 10:01:46 +0200 Subject: doc: Fix GHC clean rule Apparently GHC's build system doesn't permit wildcards in clean paths. --- CHANGES | 2 ++ doc/ghc.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/CHANGES b/CHANGES index 2b92b56d..f27d151c 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,8 @@ Changes in version 2.17.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) diff --git a/doc/ghc.mk b/doc/ghc.mk index 830c3bbc..3e53168e 100644 --- a/doc/ghc.mk +++ b/doc/ghc.mk @@ -13,7 +13,7 @@ ifeq "$(BUILD_SPHINX_HTML)" "YES" html : html_utils/haddock/doc -$(eval $(call clean-target,utils/haddock/doc,sphinx,utils/haddock/doc/haddock utils/haddock/doc/.build-*)) +$(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 -- cgit v1.2.3