Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/Documentation/Makefile b/Documentation/Makefile
index aaf95918c3cb0e89b9c608e1df4eb548f38203d7..7c1c9e1918829b90aeb4e47d10aa0f5951204b0c 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -32,10 +32,12 @@ man7dir=$(mandir)/man7
 # DESTDIR=
 
 ASCIIDOC=asciidoc
+ASCIIDOC_EXTRA =
 INSTALL?=install
 DOC_REF = origin/man
 
 -include ../config.mak.autogen
+-include ../config.mak
 
 #
 # Please note that there is a minor bug in asciidoc.
@@ -92,7 +94,7 @@ clean:
        rm -f $(cmds_txt)
 
 %.html : %.txt
-       $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $<
+       $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $<
 
 %.1 %.7 : %.xml
        xmlto -m callouts.xsl man $<
@@ -103,8 +105,11 @@ clean:
 user-manual.xml: user-manual.txt user-manual.conf
        $(ASCIIDOC) -b docbook -d book $<
 
+XSLT = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
+XSLTOPTS = --nonet --xinclude --stringparam html.stylesheet docbook-xsl.css
+
 user-manual.html: user-manual.xml
-       xmlto html-nochunks $<
+       xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
 
 glossary.html : glossary.txt sort_glossary.pl
        cat $< | \