CVS: moonbase/doc-tools/docbook-xml POST_REMOVE, NONE, 1.1 BUILD, 1.1, 1.2 DEPENDS, 1.1, 1.2 POST_INSTALL, 1.3, 1.4 PRE_REMOVE, 1.2, 1.3

[nhudson at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/doc-tools/docbook-xml
In directory dbguin.lunar-linux.org:/tmp/cvs-serv6345/docbook-xml

Modified Files:
	BUILD DEPENDS POST_INSTALL PRE_REMOVE 
Added Files:
	POST_REMOVE 
Log Message:


Once again making fixes for the new docbook install 


--- NEW FILE: POST_REMOVE ---
#this takes care of the old install directory

rm -fr /usr/share/$MODULE

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-xml/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	3 Jan 2003 05:07:50 -0000	1.1
+++ BUILD	1 Aug 2003 13:31:23 -0000	1.2
@@ -4,7 +4,7 @@
      rm -Rf /usr/share/xml
   fi                                            &&
 
-  TARGET=/usr/share/docbook-xml
+  TARGET=/usr/share/sgml/docbook/$MODULE-$VERSION
  
   cd $SOURCE_DIRECTORY                          &&
   prepare_install                               &&
@@ -12,6 +12,8 @@
        mkdir -p $TARGET
   fi                                            &&
  
-  cp -a * $TARGET
+  cp -a * $TARGET                               &&
+
+  ln -sf $TARGET/docbook.cat $TARGET/catalog 
   
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-xml/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS	3 Jan 2003 05:07:50 -0000	1.1
+++ DEPENDS	1 Aug 2003 13:31:23 -0000	1.2
@@ -1 +1,2 @@
+depends openjade &&
 depends libxslt

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-xml/POST_INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- POST_INSTALL	1 Jun 2003 21:30:48 -0000	1.3
+++ POST_INSTALL	1 Aug 2003 13:31:23 -0000	1.4
@@ -1,4 +1,6 @@
+catalog=/usr/share/sgml/docbook/$MODULE-$VERSION/catalog
+
 if [ ! -d /etc/xml ]; then
   mkdir /etc/xml
 fi
-install-catalog --add /etc/sgml/catalog /usr/share/docbook-xml/docbook.cat
+install-catalog --add /etc/sgml/catalog $catalog 

Index: PRE_REMOVE
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-xml/PRE_REMOVE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PRE_REMOVE	1 Jun 2003 21:30:48 -0000	1.2
+++ PRE_REMOVE	1 Aug 2003 13:31:23 -0000	1.3
@@ -1,2 +1,7 @@
+catalog=/usr/share/sgml/docbook/$MODULE-$VERSION/catalog 
+
+#Old way, this takes care of the old way of doing it.
 install-catalog -r /etc/sgml/catalog /usr/share/docbook-xml/docbook.cat
 install-catalog -r /etc/xml/catalog /usr/share/docbook-xml/docbook.cat
+
+install-catalog -r /etc/xml/catalog $catalog