diff options
| author | Kefu Chai <kchai@redhat.com> | 2015-05-04 19:57:17 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2015-05-04 20:00:02 +0200 |
| commit | 156e55b7f95bb7f1d73e1131d94aca75fb339315 (patch) | |
| tree | eab2b7b1047b6760caf916e5d4bc3606f35587f4 | |
| parent | configure.ac: do not check for sphinx-build (diff) | |
| download | ceph-156e55b7f95bb7f1d73e1131d94aca75fb339315.tar.xz ceph-156e55b7f95bb7f1d73e1131d94aca75fb339315.zip | |
man: do not dist man pages if sphinx is not available
Signed-off-by: Kefu Chai <kchai@redhat.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 32 | ||||
| -rw-r--r-- | man/Makefile.am | 2 |
4 files changed, 39 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 73817e5c76f..2e24361bfcf 100644 --- 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 f638f57d3d7..30c9287ffbf 100644 --- 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 index 00000000000..e04e8c468f6 --- /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 ed59328ef39..2298866efe6 100644 --- 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 |