[PATCH] Use DocBook stylesheets from xorg-sgml-doctools if they're available

[Gaetan Nadon]

On Fri, 2010-06-25 at 17:23 -0700, Alan Coopersmith wrote:

> +STYLESHEET_SRCDIR = $(XORG_SGML_PATH)/X11
> +XSL_STYLESHEET = $(STYLESHEET_SRCDIR)/xorg.xsl
> 

Now that util-macros 1.10 is released:

        
        doc/xml/xmlrules.in:43: STYLESHEET_SRCDIR was already defined in condition TRUE, which includes condition HAVE_DOCBOOK_STYLESHEETS ...
        doc/xml/Makefile.am:26:   `doc/xml/xmlrules.in' included from here
        configure.ac:41: ... `STYLESHEET_SRCDIR' previously defined here
        doc/xml/xmlrules.in:44: XSL_STYLESHEET was already defined in condition TRUE, which includes condition HAVE_DOCBOOK_STYLESHEETS ...
        doc/xml/Makefile.am:26:   `doc/xml/xmlrules.in' included from here
        configure.ac:41: ... `XSL_STYLESHEET' previously defined here
        hw/dmx/doc/../../../doc/xml/xmlrules.in:43: STYLESHEET_SRCDIR was already defined in condition TRUE, which includes condition HAVE_DOCBOOK_STYLESHEETS ...
        hw/dmx/doc/Makefile.am:24:   `hw/dmx/doc/../../../doc/xml/xmlrules.in' included from here
        configure.ac:41: ... `STYLESHEET_SRCDIR' previously defined here
        hw/dmx/doc/../../../doc/xml/xmlrules.in:44: XSL_STYLESHEET was already defined in condition TRUE, which includes condition HAVE_DOCBOOK_STYLESHEETS ...
        hw/dmx/doc/Makefile.am:24:   `hw/dmx/doc/../../../doc/xml/xmlrules.in' included from here
        configure.ac:41: ... `XSL_STYLESHEET' previously defined here
        hw/xfree86/doc/sgml/../../../../doc/xml/xmlrules.in:43: STYLESHEET_SRCDIR was already defined in condition TRUE, which includes condition HAVE_DOCBOOK_STYLESHEETS ...
        hw/xfree86/doc/sgml/Makefile.am:24:   `hw/xfree86/doc/sgml/../../../../doc/xml/xmlrules.in' included from here
        configure.ac:41: ... `STYLESHEET_SRCDIR' previously defined here
        hw/xfree86/doc/sgml/../../../../doc/xml/xmlrules.in:44: XSL_STYLESHEET was already defined in condition TRUE, which includes condition HAVE_DOCBOOK_STYLESHEETS ...
        hw/xfree86/doc/sgml/Makefile.am:24:   `hw/xfree86/doc/sgml/../../../../doc/xml/xmlrules.in' included from here
        configure.ac:41: ... `XSL_STYLESHEET' previously defined here

The attached modified patch would fix it.
Probably also to update .gitignore with *.css in the directory where
xmlrules.in is  included.



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100625/fc745d57/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Use-DocBook-stylesheets-from-xorg-sgml-doctools-if-t.patch
Type: text/x-patch
Size: 2220 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100625/fc745d57/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100625/fc745d57/attachment-0001.pgp>