diff --git a/docbook-dtds.spec b/docbook-dtds.spec
index 2bf4aa2..304c1f6 100644
--- a/docbook-dtds.spec
+++ b/docbook-dtds.spec
@@ -1,6 +1,6 @@
 Name: docbook-dtds
 Version: 1.0
-Release: 36%{?dist}
+Release: 37%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -621,6 +621,7 @@ fi
 # the order of the lines, and SGML tools don't like to see XML things
 # they aren't expecting.
 CATALOG=/etc/sgml/catalog
+CAT_DIR=/usr/share/sgml/docbook/
 SGML=$(cat -n ${CATALOG} | grep sgml-docbook | head -1 | (read n line;echo $n))
 XML=$(cat -n ${CATALOG} | grep xml-docbook | head -1 | (read n line; echo $n))
 # Do they need switching around?
@@ -645,447 +646,447 @@ then
   # DocBook XML V4.1.2
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.1.2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.2
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.2" \
-    "xml-dtd-4.2-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.2" \
-    "xml-dtd-4.2-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.3
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.3//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.3" \
-    "xml-dtd-4.3-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.3" \
-    "xml-dtd-4.3-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.4//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.4" \
-    "xml-dtd-4.4-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.4" \
-    "xml-dtd-4.4-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
 
    # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Publishing//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.4//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES General Technical//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "public" \
     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.5" \
-    "xml-dtd-4.5-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
   /usr/bin/xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.5" \
-    "xml-dtd-4.5-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
 
 fi
 
@@ -1192,296 +1193,299 @@ if [ -w $CATALOG ]
 then
   # DocBook XML V4.1.2
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.1.2-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.2
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.2-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.2-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.3
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.3-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.3-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.4
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.4-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.4-%{version}-%{release}" $CATALOG
 
   # DocBook XML V4.5
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-pub.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbpoolx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-box.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/docbookx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk3.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsn.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-num.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbcentx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk4.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbnotnx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-dia.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-grk2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbgenent.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/dbhierx.mod" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsa.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amso.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyrl.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-tech.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsc.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/soextblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/calstblx.dtd" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat1.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsb.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-lat2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-amsr.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}/ent/iso-cyr2.ent" $CATALOG
   /usr/bin/xmlcatalog --noout --del \
-    "xml-dtd-4.5-%{version}-%{release}" $CATALOG
+    "${CAT_DIR}xml-dtd-4.5-%{version}-%{release}" $CATALOG
 fi
 
 %changelog
+* Wed Jul 09 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-37
+- use full paths in xmlcatalog registration
+
 * Tue May 13 2008 Ondrej Vasik <ovasik@redhat.com> - 1.0-36
 - changed License(#445008)