man: point man/conf.py and Makefile to doc/man

Fixes: ceph#11320 Signed-off-by: Kefu Chai <[email protected]>
thomasgoirand · Apr 7, 2015 · c7effab · c7effab
1 parent 0e07ccc
commit c7effab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/man/Makefile.am b/man/Makefile.am
@@ -13,15 +13,15 @@ include Makefile-server.am
 endif
 
 check-local:
-	${SPHINX_BUILD} -b man -d doctrees . $(top_builddir)/man
+	${SPHINX_BUILD} -b man -d doctrees -c . $(top_srcdir)/doc/man $(top_builddir)/man
 
 # prevent `make` from running in parallel, sphinx runs better in batch mode.
 .PHONY: sphinx-build.stamp
 
 $(dist_man_MANS): sphinx-build.stamp
 
 sphinx-build.stamp:
-	${SPHINX_BUILD} -Q -b man -d doctrees -c . . $(top_builddir)/man
+	${SPHINX_BUILD} -Q -b man -d doctrees -c . $(top_srcdir)/doc/man $(top_builddir)/man
 
 clean-local:
 	@rm -f *.8

diff --git a/man/conf.py b/man/conf.py
@@ -8,8 +8,9 @@
 exclude_patterns = ['**/.#*', '**/*~']
 
 def _get_manpages():
-    import os
-    man_dir = os.path.dirname(__file__)
+    src_dir = os.path.dirname(__file__)
+    top_srcdir = os.path.dirname(src_dir)
+    man_dir = os.path.join(top_srcdir, 'doc', 'man')
     sections = os.listdir(man_dir)
     for section in sections:
         section_dir = os.path.join(man_dir, section)