[commit: ghc] ghc-8.0: Don't output manpage in same directory as source (50d3b7f)

git at git.haskell.org git at git.haskell.org
Sat Jan 16 12:49:07 UTC 2016


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

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

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

commit 50d3b7f564c4cb5247a453e18a96113f2362eda0
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Jan 15 16:35:38 2016 +0100

    Don't output manpage in same directory as source
    
    Test Plan: Validate
    
    Reviewers: austin, thomie, nomeata
    
    Differential Revision: https://phabricator.haskell.org/D1782
    
    GHC Trac Issues: #11433
    
    (cherry picked from commit 7cf16aaf6d08a6be7f4c4a20b8684d61e1ee3163)


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

50d3b7f564c4cb5247a453e18a96113f2362eda0
 .gitignore              | 1 +
 docs/users_guide/ghc.mk | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0455251..5c2af90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,7 @@ _darcs/
 /docs/users_guide/users_guide.pdf
 /docs/users_guide/build-html
 /docs/users_guide/build-pdf
+/docs/users_guide/build-man
 /docs/users_guide/.doctrees-*
 /docs/users_guide/.doctrees/
 /driver/ghci/ghc-pkg-inplace
diff --git a/docs/users_guide/ghc.mk b/docs/users_guide/ghc.mk
index deb60a3..83cf60a 100644
--- a/docs/users_guide/ghc.mk
+++ b/docs/users_guide/ghc.mk
@@ -23,11 +23,11 @@ html_docs/users_guide : docs/users_guide/images/prof_scc.svg
 docs/users_guide_MAN_RST_SOURCES := docs/users_guide/ghc.rst
 
 MAN_SECTION := 1
-MAN_PAGES := docs/users_guide/ghc.1
+MAN_PAGES := docs/users_guide/build-man/ghc.1
 
 ifneq "$(BINDIST)" "YES"
 $(MAN_PAGES): $(docs/users_guide_MAN_RST_SOURCES) $(utils/mkUserGuidePart_GENERATED_RST_SOURCES)
-	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide
+	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide/build-man
 endif
 
 man : $(MAN_PAGES)



More information about the ghc-commits mailing list