summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJonas Fonseca <fonseca@diku.dk>2007-11-14 09:38:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-14 10:01:54 (GMT)
commit7f55cf451c9e7c35cad2efcd0bb7bbd7c7ae29ac (patch)
tree89229b2ff3a7ad9a444278f09dd5fc17a4be8511 /Documentation/Makefile
parentcb5c49b9afb5551659c6819aefaa8e4de26a4366 (diff)
downloadgit-7f55cf451c9e7c35cad2efcd0bb7bbd7c7ae29ac.zip
git-7f55cf451c9e7c35cad2efcd0bb7bbd7c7ae29ac.tar.gz
git-7f55cf451c9e7c35cad2efcd0bb7bbd7c7ae29ac.tar.bz2
Documentation: Fix man page breakage with DocBook XSL v1.72
From version 1.72 it will replace all dots in roff requests with U+2302 ("house" character), and add escaping in output for all instances of dot that are not in roff requests. This caused the ".ft" hack forcing monospace font in listingblocks to end up as "\&.ft" and being visible in the resulting man page. The fix adds a DOCBOOK_XSL_172 build variable that will disable the hack. To allow this variable to be defined in config.mak it also moves build variable handling below the inclusion of config.mak. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 39ec0ed..d886641 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -37,9 +37,6 @@ man7dir=$(mandir)/man7
ASCIIDOC=asciidoc
ASCIIDOC_EXTRA =
-ifdef ASCIIDOC8
-ASCIIDOC_EXTRA += -a asciidoc7compatible
-endif
INSTALL?=install
RM ?= rm -f
DOC_REF = origin/man
@@ -52,6 +49,13 @@ DOCBOOK2X_TEXI=docbook2x-texi
-include ../config.mak.autogen
-include ../config.mak
+ifdef ASCIIDOC8
+ASCIIDOC_EXTRA += -a asciidoc7compatible
+endif
+ifdef DOCBOOK_XSL_172
+ASCIIDOC_EXTRA += -a docbook-xsl-172
+endif
+
#
# Please note that there is a minor bug in asciidoc.
# The version after 6.0.3 _will_ include the patch found here: