[PATCH xorg-docs 1/3] HTML file generation: use the installed copy of xorg.css

Alan Coopersmith alan.coopersmith at oracle.com
Fri Nov 5 18:53:10 PDT 2010


Gaetan Nadon wrote:
> Currenlty 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.
> 
> With this patch the HTML file contains the following XML element:
> <link rel="stylesheet"
> href="/home/nadon/xorg/src/share/sgml/X11/xorg.css" type="text/css" />
> when build from prefix /home/nadon/xorg/src.
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  .gitignore  |    1 -
>  xmlrules.in |    9 ++++-----
>  2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 2a13ce0..a8719d3 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -80,4 +80,3 @@ core
>  *.ps
>  *.pdf
>  *.txt
> -*.css
> diff --git a/xmlrules.in b/xmlrules.in
> index 9d41c65..1523a74 100644
> --- a/xmlrules.in
> +++ b/xmlrules.in
> @@ -36,11 +36,10 @@ endif
>  XMLTO_FLAGS = --searchpath $(XORG_SGML_PATH)/X11
>  
>  if HAVE_STYLESHEETS
> -XMLTO_FLAGS += -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
> -
> -xml_DATA += 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	\
> +	--stringparam img.src.path=$(abs_builddir)/
>  endif
>  
>  CLEANFILES = $(xml_DATA)

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