From: Junio C Hamano Date: Thu, 3 Dec 2009 19:12:32 +0000 (-0800) Subject: Documentation: xmlto 0.0.18 does not know --stringparam X-Git-Tag: v1.6.5.5~26 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=59a0a0bd579087cce9f7baf6627e5add5a538097;p=git.git Documentation: xmlto 0.0.18 does not know --stringparam Newer DocBook stylesheets want man.base.url.for.relative.links parameter set when formatting manpages with external references to turn them into full URLs, and leave a helpful "you should set this parameter" message in the output. Earlier we added the MAN_BASE_URL make variable to specify the value for it. When MAN_BASE_URL is not given, it ought to be safe to set the parameter to empty; it would result in an empty leading path for older stylesheets that ignore the parameter, and newer ones would produce the same "relative URL" without the message. Unfortunately, older xmlto (at least version 0.0.18 released in early 2004 that comes with RHEL/CentOS 5) does not understand the --stringparam command line option, so we cannot add the parameter definition unconditionally to the command line. Work it around by passing the parameter only when set. If you do not have a suitable URL prefix, you can pass a quoted empty string to it, like so: $ make MAN_BASE_URL='""' Signed-off-by: Junio C Hamano --- diff --git a/Documentation/Makefile b/Documentation/Makefile index d4c05ca87..1c9dfcea5 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -108,7 +108,14 @@ endif # 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. +# +# As older stylesheets simply ignore this parameter, it ought to be +# safe to set it to empty string when the base URL is not specified, +# but unfortunately we cannot do so unconditionally because at least +# xmlto 0.0.18 is reported to lack --stringparam option. +ifdef MAN_BASE_URL 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