libXmu: Branch 'master'

[Gaetan Nadon]

 doc/.gitignore  |    2 --
 doc/Makefile.am |    9 ++++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 813ee0dcecc89d3f334d8747b171c71e34a7671e
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Tue Nov 9 13:04:57 2010 -0500

    config: HTML file generation: use the installed copy of xorg.css
    
    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.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/doc/.gitignore b/doc/.gitignore
index 0765019..9e85e14 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,6 +1,4 @@
-#		Add & Override for this directory and it's subdirectories
 *.txt
 *.html
 *.pdf
 *.ps
-*.css
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3c1df53..83685dc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -38,11 +38,10 @@ endif
 CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css
 
 if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
-	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+XMLTO_FLAGS = 			\
+	-m $(XSL_STYLESHEET)	\
+	--stringparam img.src.path=$(abs_builddir)/	\
+	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
 endif
 
 XML_SOURCEFILES =  $(srcdir)/Xmu.xml $(XSL_STYLESHEET)