Merge in 1.6.5.4

[thirdparty/git.git] / Documentation / Makefile

diff --git a/Documentation/Makefile b/Documentation/Makefile
index abb75eb136e3b41e17c232e38a022fd592cbfa63..e841ca96cb419886ce8e9ca66798442cd5c9dfdf 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -104,9 +104,12 @@ ifdef DOCBOOK_SUPPRESS_SP
 XMLTO_EXTRA += -m manpage-suppress-sp.xsl
 endif
 
-ifdef MAN_BASE_URL
+# Newer DocBook stylesheet emits warning cruft in the output when
+# this is not set, and if set it shows an absolute link.  We can
+# use MAN_BASE_URL=http://www.kernel.org/pub/software/scm/git/docs/
+# but distros may want to set it to /usr/share/doc/git-core/docs/ or
+# something like that.
 XMLTO_EXTRA += --stringparam man.base.url.for.relative.links=$(MAN_BASE_URL)
-endif
 
 # If your target system uses GNU groff, it may try to render
 # apostrophes as a "pretty" apostrophe using unicode.  This breaks