From c7effab565e6733456c4423f8653c9b722a45ccd Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 7 Apr 2015 12:29:04 +0800 Subject: [PATCH] man: point man/conf.py and Makefile to doc/man Fixes: #11320 Signed-off-by: Kefu Chai --- man/Makefile.am | 4 ++-- man/conf.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 9927646f01831..f7b4dac671dec 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -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 diff --git a/man/conf.py b/man/conf.py index 4ba7317c3cc79..375bfb987cf9b 100644 --- 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)