[commit: haddock] 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: doc: Fix GHC clean rule (af1a868)

git at git.haskell.org git at git.haskell.org
Mon Nov 20 21:02:03 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/af1a8689da1990da9a152ae8a0e51976f2a27ff6

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

commit af1a8689da1990da9a152ae8a0e51976f2a27ff6
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu May 12 10:01:46 2016 +0200

    doc: Fix GHC clean rule
    
    Apparently GHC's build system doesn't permit wildcards in clean paths.


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

af1a8689da1990da9a152ae8a0e51976f2a27ff6
 CHANGES    | 2 ++
 doc/ghc.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 2b92b56..f27d151 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 830c3bb..3e53168 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



More information about the ghc-commits mailing list