From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 2 Apr 2015 23:46:36 +0000 (+0200)
Subject: man: using sphinx-1.0-build if no sphinx-build
X-Git-Tag: v9.0.0~46^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e39070fea7bd2568860076c3360dc306ab73d64e;p=ceph.git

man: using sphinx-1.0-build if no sphinx-build

On RHEL 6 and CentOS 6 sphinx 1.0+ which is required to build man pages
is packaged as sphinx10 instead of sphinx and the binary is
sphinx-1.0-build instead of sphinx-build.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index d0cdc672d940..6c756e122d9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ if test -d ".git" ; then
 fi
 AC_MSG_NOTICE([RPM_RELEASE='$RPM_RELEASE'])
 
-AC_CHECK_PROG(SPHINX_BUILD, sphinx-build, yes, no)
+AC_CHECK_PROGS(SPHINX_BUILD, sphinx-1.0-build sphinx-build, no)
 if test x"$SPHINX_BUILD" = x"no"; then
   AC_MSG_ERROR([sphinx-build not found (python-sphinx)])
 fi
diff --git a/man/Makefile.am b/man/Makefile.am
index bc7dc717d1ab..9927646f0183 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 . $(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_builddir)/man
 
 clean-local:
 	@rm -f *.8