[PATCH xorg-docs 2/3] xmlrules.in: do not use --searchpath when sgml-doctools not installed
Alan Coopersmith
alan.coopersmith at oracle.com
Fri Nov 5 18:51:45 PDT 2010
Gaetan Nadon wrote:
> The option to define a searchpath for css and xsl files is not
> required when such files are known to be missing.
>
> The command emitted is:
> /usr/bin/xmlto --searchpath /X11 xhtml-nochunks dps.xml
>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
> xmlrules.in | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/xmlrules.in b/xmlrules.in
> index 1523a74..41abb1b 100644
> --- a/xmlrules.in
> +++ b/xmlrules.in
> @@ -32,12 +32,10 @@ if HAVE_XMLTO_TEXT
> xml_DATA += $(doc_sources:.xml=.txt)
> endif
>
> -# Path to find X11/defs.ent
> -XMLTO_FLAGS = --searchpath $(XORG_SGML_PATH)/X11
> -
> if HAVE_STYLESHEETS
> -XMLTO_FLAGS += \
> +XMLTO_FLAGS = \
> -m $(XSL_STYLESHEET) \
> + --searchpath $(XORG_SGML_PATH)/X11 \
> --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \
> --stringparam img.src.path=$(abs_builddir)/
> endif
Oops. Since it was for X11/defs.ent, not the stylesheets, I'd put it outside
the if HAVE_STYLESHEETS, but I suppose since the X11/defs.ent isn't XML
compatible until after the version with style sheets, that wasn't useful.
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
--
-Alan Coopersmith- alan.coopersmith at oracle.com
Oracle Solaris Platform Engineering: X Window System
More information about the xorg-devel
mailing list