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 d0cdc672d94031755b7f858c03a4e3270146f401..6c756e122d9f885aadf55c1aeb0fbf52e4438b2e 100644 (file)
--- 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 bc7dc717d1aba236549f16791138e43c8d5f9b55..9927646f018313b1b78384e7eac5c79a8a8fdc85 100644 (file)
--- 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