doc,cmake: do not scan non-man pages when building man pages

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0e00d2f21bddd8ee811dec816cff5b4f05b1f891)

Conflicts:
	doc/man/CMakeLists.txt: jewel does not have this file. so do
not cherry-pick changes of it.

diff --git a/doc/conf.py b/doc/conf.py
index 3bcc7de62512c4a7f8c99ec2a5f2891cacd56aff..68756605d19543c7d5c967a5b3baa1c64ad7813d 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -10,6 +10,18 @@ templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 exclude_patterns = ['**/.#*', '**/*~', 'start/quick-common.rst']
+if tags.has('man'):
+    exclude_patterns += ['architecture.rst', 'glossary.rst', 'release*.rst',
+                         'api/*',
+                         'cephfs/*',
+                         'dev/*',
+                         'install/*',
+                         'mon/*',
+                         'rados/*',
+                         'radosgw/*',
+                         'rbd/*',
+                         'start/*']
+
 pygments_style = 'sphinx'
 
 html_theme = 'ceph'

diff --git a/man/Makefile.am b/man/Makefile.am
index 0dcf03826ee360aa893a2d0efd14fc4938c0a40b..81a9521a064eb12e77c30fac1af417f598381204 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -21,7 +21,7 @@ $(dist_man_MANS): sphinx-build.stamp
 # in a tree populated from dist tarball, the $(top_srcdir)/doc is not included
 sphinx-build.stamp:
        if [ -d $(top_srcdir)/doc/man ] ; then \
-               ${SPHINX_BUILD} -b man -d doctrees -c $(top_srcdir)/man $(top_srcdir)/doc/man $(top_builddir)/man; \
+               ${SPHINX_BUILD} -b man -t man -d doctrees -c $(top_srcdir)/man $(top_srcdir)/doc/man $(top_builddir)/man; \
        fi
 
 clean-local: