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.
From f612e8d6af34246a9d626de05defd4d7bc466bb6 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <[email protected]> Date: Fri, 25 Jun 2010 17:23:18 -0700 Subject: [PATCH xserver] Use DocBook stylesheets from xorg-sgml-doctools if they're available Bumps minimum xorg-macros requirement from 1.6 to 1.7 Signed-off-by: Alan Coopersmith <[email protected]> --- configure.ac | 7 ++++--- doc/xml/xmlrules.in | 10 +++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 4491e90..188b6ec 100644 --- a/configure.ac +++ b/configure.ac @@ -32,12 +32,13 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.6) + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS XORG_WITH_DOXYGEN(1.6.1) +XORG_CHECK_SGML_DOCTOOLS(1.5) m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])]) XORG_FONT_MACROS_VERSION(1.1) diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in index 1be3691..0d094be 100644 --- a/doc/xml/xmlrules.in +++ b/doc/xml/xmlrules.in @@ -39,6 +39,14 @@ SUFFIXES = .xml .txt .html .pdf XML_ENT_DIR = $(abs_top_builddir)/doc/xml XMLTO_FLAGS = --searchpath $(XML_ENT_DIR) +if HAVE_STYLESHEETS +XMLTO_FLAGS += -m $(XSL_STYLESHEET) +BUILT_DOC_FILES += xorg.css + +xorg.css: $(STYLESHEET_SRCDIR)/xorg.css + $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ +endif + if HAVE_XMLTO BUILT_DOC_FILES += $(TXT_FILES) .xml.txt: @@ -59,7 +67,7 @@ endif endif -CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) +CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) xorg.css # All the files we build depend on the entities $(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent -- 1.6.0.4
signature.asc
Description: This is a digitally signed message part
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
