[PATCH xserver 1/7] doc: HTML file generation: use the installed copy of xorg.css

[Matt Dew]

Reviewed-by: Matt Dew <matt at osource.org>

On Sun, 2010-11-21 at 09:48 -0500, Gaetan Nadon wrote:
> Currently the xorg.css file is copied in each location
> where a DocBook/XML file resides. This produces about
> 70 copies in the $(docdir) install tree for all of xorg.
> 
> Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  doc/xml/.gitignore        |    1 -
>  doc/xml/dtrace/.gitignore |    1 -
>  doc/xml/xmlrules.in       |    9 +++------
>  3 files changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/doc/xml/.gitignore b/doc/xml/.gitignore
> index 3d050f0..4961738 100644
> --- a/doc/xml/.gitignore
> +++ b/doc/xml/.gitignore
> @@ -3,4 +3,3 @@ xserver.ent
>  Xserver-spec.html
>  Xserver-spec.pdf
>  Xserver-spec.txt
> -xorg.css
> diff --git a/doc/xml/dtrace/.gitignore b/doc/xml/dtrace/.gitignore
> index a43c4e1..e2a21d1 100644
> --- a/doc/xml/dtrace/.gitignore
> +++ b/doc/xml/dtrace/.gitignore
> @@ -1,4 +1,3 @@
>  Xserver-DTrace.html
>  Xserver-DTrace.pdf
>  Xserver-DTrace.txt
> -xorg.css
> diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in
> index b7fda11..f828eef 100644
> --- a/doc/xml/xmlrules.in
> +++ b/doc/xml/xmlrules.in
> @@ -40,11 +40,8 @@ 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 $@
> +XMLTO_FLAGS += -m $(XSL_STYLESHEET) \
> +	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
>  endif
>  
>  if HAVE_XMLTO
> @@ -69,7 +66,7 @@ endif
>  
>  endif
>  
> -CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) xorg.css
> +CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES)
>  
>  # All the files we build depend on the entities
>  $(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent