man: do not dist man pages if sphinx is not available

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 73817e5c76f970449083e556f4c8fb2a9eec51a6..2e24361bfcf9fa68f8ee2851113c72a7ceb42e80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnu
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh ceph.spec.in ceph.spec install-deps.sh
 # the "." here makes sure check-local builds gtest and gmock before they are used
-SUBDIRS = . src man
+SUBDIRS = . src man doc
 
 EXTRA_DIST += \
        src/test/run-cli-tests \

diff --git a/configure.ac b/configure.ac
index f638f57d3d76502f29490a678fed5f1c0a2b6560..30c9287ffbf2685dc7c4c496a1639604823fd155 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,9 @@ if test -d ".git" ; then
 fi
 AC_MSG_NOTICE([RPM_RELEASE='$RPM_RELEASE'])
 
+AC_CHECK_PROGS(SPHINX_BUILD, sphinx-1.0-build sphinx-build, no)
+AM_CONDITIONAL(HAS_SPHINX_BUILD, test x"$SPHINX_BUILD" != "xno")
+
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_SUBDIRS([src/gmock])
@@ -1166,5 +1169,6 @@ AC_CONFIG_FILES([Makefile
        src/java/Makefile
        src/tracing/Makefile
        man/Makefile
+       doc/Makefile
        ceph.spec])
 AC_OUTPUT

diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644 (file)
index 0000000..e04e8c4
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,32 @@
+EXTRA_DIST = \
+       man/8/ceph-authtool.rst \
+       man/8/ceph-clsinfo.rst  \
+       man/8/ceph-conf.rst     \
+       man/8/ceph-debugpack.rst        \
+       man/8/ceph-dencoder.rst \
+       man/8/ceph-deploy.rst   \
+       man/8/ceph-disk.rst     \
+       man/8/cephfs.rst        \
+       man/8/ceph-fuse.rst     \
+       man/8/ceph-mds.rst      \
+       man/8/ceph-mon.rst      \
+       man/8/ceph-osd.rst      \
+       man/8/ceph-post-file.rst        \
+       man/8/ceph-rbdnamer.rst \
+       man/8/ceph-rest-api.rst \
+       man/8/ceph.rst  \
+       man/8/ceph-run.rst      \
+       man/8/ceph-syn.rst      \
+       man/8/crushtool.rst     \
+       man/8/librados-config.rst       \
+       man/8/monmaptool.rst    \
+       man/8/mount.ceph.rst    \
+       man/8/osdmaptool.rst    \
+       man/8/radosgw-admin.rst \
+       man/8/radosgw.rst       \
+       man/8/rados.rst \
+       man/8/rbd-fuse.rst      \
+       man/8/rbd-replay-many.rst       \
+       man/8/rbd-replay-prep.rst       \
+       man/8/rbd-replay.rst    \
+       man/8/rbd.rst

diff --git a/man/Makefile.am b/man/Makefile.am
index ed59328ef39b5297bc79ed868578359e708dfe79..2298866efe6be759d5b5febfafb38fd74dcd00e6 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = conf.py
 
 dist_man_MANS = 
 
+if HAS_SPHINX_BUILD
 if ENABLE_CLIENT
 include Makefile-client.am
 endif
@@ -27,3 +28,4 @@ clean-local:
        @rm -rf doctrees
 
 MAINTAINERCLEANFILES = $(dist_man_MANS)
+endif