In Fedora 21, docbook2x-texi binary is named db2x_docbook2texi. If binary docbook2-texi is not found, looks for db2x_docbook2texi. Also gives an error if neither is found.
Signed-off by: Michael Darling <darlingm@gmail.com> --- Documentation/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Show changes to Documentation/Makefile +9 −1
diff --git a/Documentation/Makefile b/Documentation/Makefile index 3e39e28..f5f9ad5 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -116,7 +116,15 @@ HTML_REPO = ../../git-htmldocs MAKEINFO = makeinfo INSTALL_INFO = install-info -DOCBOOK2X_TEXI = docbook2x-texi + +DOCBOOK2X_TEXI = $(shell which docbook2x-texi) +ifeq (, $(DOCBOOK2X_TEXI)) +DOCBOOK2X_TEXI = $(shell which db2x_docbook2texi) +ifeq (, $(DOCBOOK2X_TEXI)) +$(error Did not find docbook2x-texi or db2x_docbook2texi, required) +endif +endif + DBLATEX = dblatex ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex ifndef PERL_PATH
-- 2.4.0.53.g8440f74