{"thread":{"id":"39866","subject":"Re: [PATCH] Documentation: Alternate name for docbook2x-texi binary","startedAt":"2015-07-17T00:43:36Z","lastAt":"2015-07-17T00:43:36Z","messageCount":1,"participants":["Michael Darling"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"266220","messageId":"CABRuA+iM4-td27tGS6Fh4YKBxChFqU2ezF+ewstsM_59MrUo7A@mail.gmail.com","threadId":"39866","inReplyTo":null,"subject":"Re: [PATCH] Documentation: Alternate name for docbook2x-texi binary","fromName":"Michael Darling","fromEmail":"darlingm@gmail.com","sentAt":"2015-07-17T00:43:36Z","receivedAt":"2015-07-17T00:43:36Z","isPatch":true,"sender":{"key":"darlingm@gmail.com","avatar":null},"body":"Ping.  Don't have write access.\n\nApplied as an attachment, in case there were any formatting issues.\n\nOn Wed, May 13, 2015 at 4:28 AM, Michael Darling <darlingm@gmail.com> wrote:\n> In Fedora 21, docbook2x-texi binary is named db2x_docbook2texi.\n> If binary docbook2-texi is not found, looks for db2x_docbook2texi.\n> Also gives an error if neither is found.\n>\n> Signed-off by: Michael Darling <darlingm@gmail.com>\n> ---\n>  Documentation/Makefile | 10 +++++++++-\n>  1 file changed, 9 insertions(+), 1 deletion(-)\n>\n> diff --git a/Documentation/Makefile b/Documentation/Makefile\n> index 3e39e28..f5f9ad5 100644\n> --- a/Documentation/Makefile\n> +++ b/Documentation/Makefile\n> @@ -116,7 +116,15 @@ HTML_REPO = ../../git-htmldocs\n>\n>  MAKEINFO = makeinfo\n>  INSTALL_INFO = install-info\n> -DOCBOOK2X_TEXI = docbook2x-texi\n> +\n> +DOCBOOK2X_TEXI = $(shell which docbook2x-texi)\n> +ifeq (, $(DOCBOOK2X_TEXI))\n> +DOCBOOK2X_TEXI = $(shell which db2x_docbook2texi)\n> +ifeq (, $(DOCBOOK2X_TEXI))\n> +$(error Did not find docbook2x-texi or db2x_docbook2texi, required)\n> +endif\n> +endif\n> +\n>  DBLATEX = dblatex\n>  ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex\n>  ifndef PERL_PATH\n> --\n> 2.4.0.53.g8440f74\n\n\n---\n Documentation/Makefile | 10 +++++++++-\n 1 file changed, 9 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 3e39e28..f5f9ad5 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -116,7 +116,15 @@ HTML_REPO = ../../git-htmldocs\n\n MAKEINFO = makeinfo\n INSTALL_INFO = install-info\n-DOCBOOK2X_TEXI = docbook2x-texi\n+\n+DOCBOOK2X_TEXI = $(shell which docbook2x-texi)\n+ifeq (, $(DOCBOOK2X_TEXI))\n+DOCBOOK2X_TEXI = $(shell which db2x_docbook2texi)\n+ifeq (, $(DOCBOOK2X_TEXI))\n+$(error Did not find docbook2x-texi or db2x_docbook2texi, required)\n+endif\n+endif\n+\n DBLATEX = dblatex\n ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex\n ifndef PERL_PATH\n"}]}