Skip to content

Commit

Permalink
man: do not dist man pages if sphinx is not available
Browse files Browse the repository at this point in the history
Signed-off-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov committed May 4, 2015
1 parent c107b8e commit 156e55b
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -1166,5 +1169,6 @@ AC_CONFIG_FILES([Makefile
src/java/Makefile
src/tracing/Makefile
man/Makefile
doc/Makefile
ceph.spec])
AC_OUTPUT
32 changes: 32 additions & 0 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions man/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ EXTRA_DIST = conf.py

dist_man_MANS =

if HAS_SPHINX_BUILD
if ENABLE_CLIENT
include Makefile-client.am
endif
Expand All @@ -27,3 +28,4 @@ clean-local:
@rm -rf doctrees

MAINTAINERCLEANFILES = $(dist_man_MANS)
endif

0 comments on commit 156e55b

Please sign in to comment.