[Lunar-commits] CVS: moonbase/doc-tools/openjade POST_INSTALL, 1.12, 1.13

[Auke Kok]

Update of /var/cvs/lunar/moonbase/doc-tools/openjade
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/doc-tools/openjade

Modified Files:
	POST_INSTALL 
Log Message:
Reordered and REMOVED A HARDCODED VERSION ... cause of bug #581


Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/openjade/POST_INSTALL,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- POST_INSTALL	30 Nov 2004 01:04:02 -0000	1.12
+++ POST_INSTALL	6 Dec 2004 12:01:30 -0000	1.13
@@ -6,21 +6,17 @@
      echo "Creating $centralized!" 
      mkdir -p /etc/sgml
      touch $centralized
-fi                                             &&
+fi  &&
 
-/usr/bin/install-catalog --add $centralized $CATALOGDIR/catalog       &&
-/usr/bin/install-catalog --add $centralized $CATALOGDIR/pubtext/catalog     &&
-/usr/bin/install-catalog --add $centralized $CATALOGDIR/contrib/catalog     &&
-/usr/bin/install-catalog --add $centralized $CATALOGDIR/unicode/catalog  &&
-/usr/bin/install-catalog -r $centralized /etc/sgml/catalog &&   
+cp $SOURCE_CACHE/$SOURCE3 /usr/share/sgml/$MODULE-$VERSION/contrib/catalog &&
 
-if ! grep -q "/usr/share/sgml/openjade-1.3" $centralized; then
-   /usr/bin/install-catalog -r $centralized /usr/share/sgml/openjade-1.3
-fi
+/usr/bin/install-catalog --add $centralized $CATALOGDIR/catalog  &&
+/usr/bin/install-catalog --add $centralized $CATALOGDIR/pubtext/catalog  &&
+/usr/bin/install-catalog --add $centralized $CATALOGDIR/contrib/catalog  &&
+/usr/bin/install-catalog --add $centralized $CATALOGDIR/unicode/catalog  &&
+/usr/bin/install-catalog -r $centralized /etc/sgml/catalog  &&
 
-if ! grep -q "/usr/share/sgml/openjade-1.3.1" $centralized; then
-   /usr/bin/install-catalog -r $centralized /usr/share/sgml/openjade-1.3.2
+if ! grep -q "/usr/share/sgml/$MODULE-$VERSION" $centralized; then
+   /usr/bin/install-catalog -r $centralized /usr/share/sgml/$MODULE-$VERSION
 fi
 
-
-cp $SOURCE_CACHE/$SOURCE3 /usr/share/sgml/$MODULE-$VERSION/contrib/catalog