git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <ebb9@byu.net>
To: git@vger.kernel.org
Cc: Eric Blake <ebb9@byu.net>
Subject: [PATCH 2/2] doc: consistently use ASCIIDOC_EXTRA
Date: Tue, 28 Apr 2009 06:28:32 -0600	[thread overview]
Message-ID: <1240921712-3100-3-git-send-email-ebb9@byu.net> (raw)
In-Reply-To: <1240921712-3100-2-git-send-email-ebb9@byu.net>

For all uses of $(ASCIIDOC) in Documentation/Makefile, supply the same
options via $(ASCIIDOC_EXTRA).

Signed-off-by: Eric Blake <ebb9@byu.net>
---

I was using asciidoc 8.4.3, and surprised when some, but not all, of the
asciidoc invocations used -a asciidoc7compatible.

 Documentation/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index e18242a..7a8037f 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -240,7 +240,7 @@ $(MAN_HTML): %.html : %.txt
 	mv $@+ $@

 user-manual.xml: user-manual.txt user-manual.conf
-	$(QUIET_ASCIIDOC)$(ASCIIDOC) -b docbook -d book $<
+	$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book $<

 technical/api-index.txt: technical/api-index-skel.txt \
 	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -293,13 +293,13 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
 	mv $@+ $@

 $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
-	$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 $*.txt
+	$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 $*.txt

 WEBDOC_DEST = /pub/software/scm/git/docs

 $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-	sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+ && \
+	sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \
 	mv $@+ $@

 install-webdoc : html
-- 
1.6.3.rc3.2.g4b51

  reply	other threads:[~2009-04-28 12:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-28 12:28 [PATCH 0/2] fix some make issues Eric Blake
2009-04-28 12:28 ` [PATCH 1/2] Makefile: installing git in cygwin 1.7.0 Eric Blake
2009-04-28 12:28   ` Eric Blake [this message]
2009-04-28 20:09     ` [PATCH 2/2] doc: consistently use ASCIIDOC_EXTRA Junio C Hamano

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

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

  git send-email \
    --in-reply-to=1240921712-3100-3-git-send-email-ebb9@byu.net \
    --to=ebb9@byu.net \
    --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.
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 NNTP newsgroup(s).