[commit: ghc] ghc-8.0: users-guide: Clean manpage build artifacts and fix usage of clean-target (e7bea17)

git at git.haskell.org git at git.haskell.org
Mon Jan 18 12:24:25 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/e7bea17d70e422dfdd16d50b531e469b4d5e3cc5/ghc

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

commit e7bea17d70e422dfdd16d50b531e469b4d5e3cc5
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Jan 17 19:26:03 2016 +0100

    users-guide: Clean manpage build artifacts and fix usage of clean-target
    
    Test Plan: Build then clean
    
    Reviewers: austin, thomie
    
    Reviewed By: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1786
    
    GHC Trac Issues: #11433
    
    (cherry picked from commit d1ce1aa9beed4d3ecd3a0324ae4c98625fbe8d33)


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

e7bea17d70e422dfdd16d50b531e469b4d5e3cc5
 docs/users_guide/ghc.mk | 2 ++
 rules/sphinx.mk         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/users_guide/ghc.mk b/docs/users_guide/ghc.mk
index 83cf60a..9144a07 100644
--- a/docs/users_guide/ghc.mk
+++ b/docs/users_guide/ghc.mk
@@ -30,6 +30,8 @@ $(MAN_PAGES): $(docs/users_guide_MAN_RST_SOURCES) $(utils/mkUserGuidePart_GENERA
 	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide/build-man
 endif
 
+$(eval $(call clean-target,users-guide,manpage,docs/users_guide/.doctrees-man/ docs/users_guide/build-man/))
+
 man : $(MAN_PAGES)
 
 ifeq "$(BUILD_MAN)" "YES"
diff --git a/rules/sphinx.mk b/rules/sphinx.mk
index 5a3c7ce..7337242 100644
--- a/rules/sphinx.mk
+++ b/rules/sphinx.mk
@@ -22,7 +22,7 @@ $(call profStart, sphinx($1,$2))
 # $1 = dir
 # $2 = docname
 
-$(call clean-target,$1,sphinx,$1/.doctrees-html/ $1/.doctrees-pdf/ $1/build-html/ $1/build-pdf/ $1/$2.pdf)
+$(eval $(call clean-target,$1,sphinx,$1/.doctrees-html/ $1/.doctrees-pdf/ $1/build-html/ $1/build-pdf/ $1/$2.pdf))
 
 # empty "all_$1" target just in case we're not building docs at all
 $(call all-target,$1,)



More information about the ghc-commits mailing list