fixed docbook issues

1 files changed, 54 insertions, 52 deletions

diff --git a/repo/devel/docbook-xml.xibuild b/repo/devel/docbook-xml.xibuild
index 2f54184..cf119ad 100644
--- a/repo/devel/docbook-xml.xibuild
+++ b/repo/devel/docbook-xml.xibuild
@@ -15,115 +15,117 @@ package () {
     install -dm755 $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5          &&
     install -m644   tools/db4-upgrade.xsl \
                     $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5
-    
-    mkdir -p $PKG_DEST/etc/xml
-    xmlcatalog --noout --create $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+} 
+
+postinstall () {
+    mkdir -p /etc/xml
+    if [ ! -e /etc/xml/docbook-$PKG_VER ]; then
+      xmlcatalog --noout --create /etc/xml/docbook-$PKG_VER
+    fi &&
 
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbook.rng" \
-      "file:/$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbook.rng" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbookxi.rng" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rng" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbook.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbook.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbookxi.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rnc" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \
+      /etc/xml/docbook-$PKG_VER &&
 
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/sch/docbook.sch" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER &&
+      "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
+      /etc/xml/docbook-$PKG_VER &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/sch/docbook.sch" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
-      $PKG_DEST/etc/xml/docbook-$PKG_VER
-
+      "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \
+      /etc/xml/docbook-$PKG_VER
 
-    xmlcatalog --noout --create $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+    xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
 
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \
-      "docbook.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \
-      "docbook.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \
-      "docbookxi.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \
-      "docbookxi.schemas/rng" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.rnc" \
-      "docbook.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.rnc" \
-      "docbook.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \
-      "docbookxi.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
+      "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \
-      "docbookxi.rnc" $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml
-    xmlcatalog --noout --create $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
+      "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml
+    xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
 
     xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \
-      "docbook.schemas/sch" $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
+      "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml &&
     xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \
-      "docbook.schemas/sch" $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml
+      "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml
 
-
-    if [ ! -e $PKG_DEST/etc/xml/catalog ]; then
-      xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog
+    if [ ! -e /etc/xml/catalog ]; then
+      xmlcatalog --noout --create /etc/xml/catalog
     fi &&
     xmlcatalog --noout --add "delegatePublic" \
       "-//OASIS//DTD DocBook XML $PKG_VER//EN" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateSystem" \
       "http://docbook.org/xml/$PKG_VER/dtd/" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/dtd/" \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/rng/"  \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/sch/"  \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog &&
+      "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog &&
     xmlcatalog --noout --add "delegateURI" \
       "http://docbook.org/xml/$PKG_VER/xsd/"  \
-      "file://$PKG_DEST/usr/share/xml/docbook/schema/xsd/$PKG_VER/catalog.xml" \
-      $PKG_DEST/etc/xml/catalog
-
+      "file:///usr/share/xml/docbook/schema/xsd/$PKG_VER/catalog.xml" \
+      /etc/xml/catalog
 }
+