From aad5b87b7e2f993aef418822d52d8dca5345fce5 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Thu, 24 Jul 2008 00:06:57 -0400
Subject: still having problems using xinclude

---
 doc/ConsoleKit.xml.in | 23 ++++++++++++++++-------
 doc/xml/Makefile.am   |  5 +----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/doc/ConsoleKit.xml.in b/doc/ConsoleKit.xml.in
index 93ad9a9..8a86511 100644
--- a/doc/ConsoleKit.xml.in
+++ b/doc/ConsoleKit.xml.in
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY dbus-Manager SYSTEM "xml/org.freedesktop.ConsoleKit.Manager.ref.xml">
+<!ENTITY dbus-Seat SYSTEM "xml/org.freedesktop.ConsoleKit.Seat.ref.xml">
+<!ENTITY dbus-Session SYSTEM "xml/org.freedesktop.ConsoleKit.Session.ref.xml">
+<!ENTITY Intro SYSTEM "xml/ck-introduction.xml">
+<!ENTITY Terms SYSTEM "xml/ck-terms.xml">
+<!ENTITY Design SYSTEM "xml/ck-design.xml">
 ]>
 
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+<book id="index">
   <bookinfo>
     <title>ConsoleKit @VERSION@ Documentation</title>
     <releaseinfo>Version @VERSION@</releaseinfo>
@@ -28,9 +34,10 @@
 
   <part>
     <title>Concepts</title>
-    <xi:include href="xml/ck-introduction.xml"/>
-    <xi:include href="xml/ck-terms.xml"/>
-    <xi:include href="xml/ck-design.xml"/>
+
+    &Intro;
+    &Terms;
+    &Design;
   </part>
 
   <part>
@@ -52,9 +59,11 @@
         This API is not yet stable and is likely to change in the future.
         </para>
       </partintro>
-      <xi:include href="xml/org.freedesktop.ConsoleKit.Manager.ref.xml"/>
-      <xi:include href="xml/org.freedesktop.ConsoleKit.Seat.ref.xml"/>
-      <xi:include href="xml/org.freedesktop.ConsoleKit.Session.ref.xml"/>
+
+      &dbus-Manager;
+      &dbus-Seat;
+      &dbus-Session;
+
     </reference>
   </part>
 
diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
index 2f5f12f..a79ab74 100644
--- a/doc/xml/Makefile.am
+++ b/doc/xml/Makefile.am
@@ -3,13 +3,10 @@ NULL =
 all : org.freedesktop.ConsoleKit.Manager.ref.xml org.freedesktop.ConsoleKit.Seat.ref.xml org.freedesktop.ConsoleKit.Session.ref.xml
 
 org.freedesktop.ConsoleKit.Manager.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Manager.xml spec-to-docbook.xsl
-	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
 org.freedesktop.ConsoleKit.Seat.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Seat.xml spec-to-docbook.xsl
-	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
 org.freedesktop.ConsoleKit.Session.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Session.xml spec-to-docbook.xsl
-	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/xml/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
 EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd
@@ -20,4 +17,4 @@ MAINTAINERCLEANFILES =		\
 	$(NULL)
 
 clean-local:
-	rm -f *~
+	rm -f *~ *.ref.xml
-- 
cgit