Skip to content

Commit

Permalink
man: using sphinx-1.0-build if no sphinx-build
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ldachary committed Apr 3, 2015
1 parent a8eab36 commit e39070f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions man/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ 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

$(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
Expand Down

0 comments on commit e39070f

Please sign in to comment.