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

Fixes: #11320
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2015-04-07 12:29:04 +08:00
parent 0e07ccc197
commit c7effab565
2 changed files with 5 additions and 4 deletions

View File

@ -13,7 +13,7 @@ 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
@ -21,7 +21,7 @@ check-local:
$(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

View File

@ -8,8 +8,9 @@ release = 'dev'
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)