[commit: ghc] master: docs: Ignore Sphinx doctrees produced by manpage build (112ce87)

git at git.haskell.org git at git.haskell.org
Wed Nov 18 11:53:57 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/112ce87444362f9f09e6a9ccf532f2ab5d80ad81/ghc

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

commit 112ce87444362f9f09e6a9ccf532f2ab5d80ad81
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Nov 18 12:23:25 2015 +0100

    docs: Ignore Sphinx doctrees produced by manpage build
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1491


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

112ce87444362f9f09e6a9ccf532f2ab5d80ad81
 .gitignore              | 3 +--
 docs/users_guide/ghc.mk | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 322ae6a..a223f30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,8 +98,7 @@ _darcs/
 /docs/users_guide/users_guide.pdf
 /docs/users_guide/build-html
 /docs/users_guide/build-pdf
-/docs/users_guide/.doctrees-html
-/docs/users_guide/.doctrees-pdf
+/docs/users_guide/.doctrees-*
 /driver/ghci/ghc-pkg-inplace
 /driver/ghci/ghci-inplace
 /driver/ghci/ghci.res
diff --git a/docs/users_guide/ghc.mk b/docs/users_guide/ghc.mk
index 1d48fa1..deb60a3 100644
--- a/docs/users_guide/ghc.mk
+++ b/docs/users_guide/ghc.mk
@@ -27,7 +27,7 @@ MAN_PAGES := docs/users_guide/ghc.1
 
 ifneq "$(BINDIST)" "YES"
 $(MAN_PAGES): $(docs/users_guide_MAN_RST_SOURCES) $(utils/mkUserGuidePart_GENERATED_RST_SOURCES)
-	$(SPHINXBUILD) -b man docs/users_guide docs/users_guide
+	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide
 endif
 
 man : $(MAN_PAGES)



More information about the ghc-commits mailing list