git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Darling <darlingm@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] Documentation: Alternate name for docbook2x-texi binary
Date: Wed, 13 May 2015 04:28:30 -0400	[thread overview]
Message-ID: <CABRuA+icJWgbpFaV=6t1zOaLfrG3i_vSpm1rwOOyp=+0eBL4zg@mail.gmail.com> (raw)

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(-)

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

             reply	other threads:[~2015-05-13  8:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-13  8:28 Michael Darling [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-17  0:43 [PATCH] Documentation: Alternate name for docbook2x-texi binary Michael Darling

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CABRuA+icJWgbpFaV=6t1zOaLfrG3i_vSpm1rwOOyp=+0eBL4zg@mail.gmail.com' \
    --to=darlingm@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).