[yelp] data/dtd/catalog: Use actual installed DTDs, not those in my home dir; #647713

[Shaun McCance <shaunm src gnome org>]

commit e27023aef0eabc579cfb8062989a6ebe4f199052
Author: Shaun McCance <shaunm gnome org>
Date:   Thu Apr 14 14:52:12 2011 -0400

    data/dtd/catalog: Use actual installed DTDs, not those in my home dir; #647713

 .gitignore                               |    1 +
 configure.ac                             |    1 +
 data/dtd/Makefile.am                     |    2 +-
 data/dtd/{catalog => catalog.in}         |   10 +-
 stylesheets/docbook/Makefile.am          |    2 -
 stylesheets/docbook/VERSION              |    6 -
 stylesheets/docbook/catalog.in           |   17 -
 stylesheets/docbook/dtd/Makefile.am      |   41 -
 stylesheets/docbook/dtd/calstblx.dtd     |  199 -
 stylesheets/docbook/dtd/dbcentx.mod      |  204 -
 stylesheets/docbook/dtd/dbgenent.mod     |   41 -
 stylesheets/docbook/dtd/dbhierx.mod      | 2074 --------
 stylesheets/docbook/dtd/dbnotnx.mod      |   97 -
 stylesheets/docbook/dtd/dbpoolx.mod      | 7516 ------------------------------
 stylesheets/docbook/dtd/docbookx.dtd     |  125 -
 stylesheets/docbook/dtd/ent/iso-amsa.ent |   63 -
 stylesheets/docbook/dtd/ent/iso-amsb.ent |   49 -
 stylesheets/docbook/dtd/ent/iso-amsc.ent |   15 -
 stylesheets/docbook/dtd/ent/iso-amsn.ent |   66 -
 stylesheets/docbook/dtd/ent/iso-amso.ent |   26 -
 stylesheets/docbook/dtd/ent/iso-amsr.ent |   91 -
 stylesheets/docbook/dtd/ent/iso-box.ent  |   45 -
 stylesheets/docbook/dtd/ent/iso-cyr1.ent |   72 -
 stylesheets/docbook/dtd/ent/iso-cyr2.ent |   31 -
 stylesheets/docbook/dtd/ent/iso-dia.ent  |   19 -
 stylesheets/docbook/dtd/ent/iso-grk1.ent |   54 -
 stylesheets/docbook/dtd/ent/iso-grk2.ent |   25 -
 stylesheets/docbook/dtd/ent/iso-grk3.ent |   48 -
 stylesheets/docbook/dtd/ent/iso-grk4.ent |   48 -
 stylesheets/docbook/dtd/ent/iso-lat1.ent |   67 -
 stylesheets/docbook/dtd/ent/iso-lat2.ent |  126 -
 stylesheets/docbook/dtd/ent/iso-num.ent  |   81 -
 stylesheets/docbook/dtd/ent/iso-pub.ent  |   90 -
 stylesheets/docbook/dtd/ent/iso-tech.ent |   69 -
 stylesheets/docbook/dtd/soextblx.dtd     |  308 --
 35 files changed, 8 insertions(+), 11721 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57de0c4..35c585f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ Makefile.in
 /data/info.xml
 /data/man.xml
 /data/toc.xml
+/data/dtd/catalog
 /depcomp
 /docs/libyelp/html-build.stamp
 /docs/libyelp/html.stamp
diff --git a/configure.ac b/configure.ac
index 7515ec6..13b2677 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,7 @@ stylesheets/toc2html.xsl
 stylesheets/yelp-common.xsl
 data/Makefile
 data/dtd/Makefile
+data/dtd/catalog
 data/icons/Makefile
 data/icons/hicolor/Makefile
 data/icons/hicolor/16x16/Makefile
diff --git a/data/dtd/Makefile.am b/data/dtd/Makefile.am
index e37975b..984979d 100644
--- a/data/dtd/Makefile.am
+++ b/data/dtd/Makefile.am
@@ -23,4 +23,4 @@ dtd_DATA =		\
 	isotech.ent	\
 	catalog
 
-EXTRA_DIST = $(dtd_DATA)
+EXTRA_DIST = $(dtd_DATA) catalog.in
diff --git a/data/dtd/catalog b/data/dtd/catalog.in
similarity index 69%
rename from data/dtd/catalog
rename to data/dtd/catalog.in
index 407d249..9a15a4c 100644
--- a/data/dtd/catalog
+++ b/data/dtd/catalog.in
@@ -3,17 +3,17 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <rewriteSystem
       systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2";
-      rewritePrefix="/home/shaunm/Projects/yelp/data/dtd"/>
+      rewritePrefix="@DATADIR@/dtd"/>
   <rewriteSystem
       systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2";
-      rewritePrefix="/home/shaunm/Projects/yelp/data/dtd"/>
+      rewritePrefix="@DATADIR@/dtd"/>
   <rewriteSystem
       systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3";
-      rewritePrefix="/home/shaunm/Projects/yelp/data/dtd"/>
+      rewritePrefix="@DATADIR@/dtd"/>
   <rewriteSystem
       systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4";
-      rewritePrefix="/home/shaunm/Projects/yelp/data/dtd"/>
+      rewritePrefix="@DATADIR@/dtd"/>
   <rewriteSystem
       systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5";
-      rewritePrefix="/home/shaunm/Projects/yelp/data/dtd"/>
+      rewritePrefix="@DATADIR@/dtd"/>
 </catalog>