[passepartout] moved the xslt stylesheets to proper places

[Sven Herzberg <herzi src gnome org>]

commit 632886f2f29f2be6bacb850c44b01c75101770eb
Author: Sven Herzberg <herzi lanedo com>
Date:   Tue Apr 28 13:06:05 2009 +0200

    moved the xslt stylesheets to proper places
    
    * data/Makefile.am,
    * src/xml2ps/docbooc.xslt -> data/docbook.xslt,
    * src/xml2ps/xhtml.xslt -> data/xhtml.xslt: added the stylesheets
    * doc/examples/example1.pp,
    * doc/examples/multilingual.pp,
    * doc/users_guide.pp: updated the paths to the xslt
    * src/xml2ps/Makefile.am: dropped the stylesheets
---
 data/Makefile.am                  |    6 ++++++
 {src/xml2ps => data}/docbook.xslt |    0
 {src/xml2ps => data}/xhtml.xslt   |    0
 doc/examples/example1.pp          |    2 +-
 doc/examples/multilingual.pp      |    2 +-
 doc/users_guide.pp                |    2 +-
 src/xml2ps/Makefile.am            |    8 +++++---
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 8d57f35..f3d1980 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,6 +4,12 @@ mime_DATA=$(mime_in_files:.in=)
 mimedir=$(datarootdir)/mime/packages
 @INTLTOOL_XML_RULE@
 
+#install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac)
+dist_xml_DATA=\
+	docbook.xslt \
+	xhtml.xslt \
+	$(NULL)
+
 update-databases:
 if DATABASE_UPDATES
 	@if test -z "$(DESTDIR)"; then \
diff --git a/src/xml2ps/docbook.xslt b/data/docbook.xslt
similarity index 100%
rename from src/xml2ps/docbook.xslt
rename to data/docbook.xslt
diff --git a/src/xml2ps/xhtml.xslt b/data/xhtml.xslt
similarity index 100%
rename from src/xml2ps/xhtml.xslt
rename to data/xhtml.xslt
diff --git a/doc/examples/example1.pp b/doc/examples/example1.pp
index 58765e1..143ae90 100644
--- a/doc/examples/example1.pp
+++ b/doc/examples/example1.pp
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <document paper_name="A4" doublesided="true" landscape="false" first_page_num="0">
   <text_stream name="stream1" file="snowflake.xml" transform=""/>
-  <text_stream name="stream2" file="example1.html" transform="../../src/xml2ps/xhtml.xslt">
+  <text_stream name="stream2" file="example1.html" transform="../../data/xhtml.xslt">
     <parameter name="basesize" value="10pt"/>
     <parameter name="h2size" value="1.2em"/>
   </text_stream>
diff --git a/doc/examples/multilingual.pp b/doc/examples/multilingual.pp
index f05fc4e..2249a16 100644
--- a/doc/examples/multilingual.pp
+++ b/doc/examples/multilingual.pp
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document paper_name="A4" doublesided="false" landscape="true" first_page_num="1">
-	<text_stream name="bread" file="multilingual.html" transform="../../src/xml2ps/xhtml.xslt">
+	<text_stream name="bread" file="multilingual.html" transform="../../data/xhtml.xslt">
     <parameter name="basesize" value="9.5"/>
     <parameter name="textfont" value="Gentium"/>
     <parameter name="textfontbold" value="Times-Bold"/>
diff --git a/doc/users_guide.pp b/doc/users_guide.pp
index f4e7ede..5e96afc 100644
--- a/doc/users_guide.pp
+++ b/doc/users_guide.pp
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document paper_name="A4" doublesided="false" landscape="false" first_page_num="1">
-  <text_stream name="stream1" file="../help/C/users_guide.xml" transform="../src/xml2ps/docbook.xslt"/>
+  <text_stream name="stream1" file="../help/C/users_guide.xml" transform="../data/docbook.xslt"/>
   <page>
     <frame name="Image pptout-sv.eps" matrix="0.18 0 0 0.18 250.667 742.66" lock="true" flowaround="true" obstaclemargin="0" type="image" file="../logotype/pptout-sv.eps"/>
     <frame name="Image hline.eps" matrix="1.58667 0 0 1 56 740" lock="true" flowaround="true" obstaclemargin="0" type="image" file="examples/hline.eps"/>
diff --git a/src/xml2ps/Makefile.am b/src/xml2ps/Makefile.am
index 260299f..c7ced35 100644
--- a/src/xml2ps/Makefile.am
+++ b/src/xml2ps/Makefile.am
@@ -24,10 +24,12 @@ xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
 	libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a 
 
 #install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac)
-dist_xml_DATA = xml2ps.dtd xhtml.xslt docbook.xslt
+dist_xml_DATA=\
+	xml2ps.dtd \
+	$(NULL)
 
-%.x2p: %.xhtml
-	xsltproc xhtml.xslt $< > $@
+%.x2p: %.xhtml $(top_srcdir)/data/xhtml.xslt
+	xsltproc $(top_srcdir)/data/xhtml.xslt $< > $@
 
 %.pdf: %.x2p
 	./xml2ps --output-format=pdf -p 300x400 < $< > $@