[project @ 2003-07-23 15:25:32 by simonmar]

[ghc-hetmet.git] / glafp-utils / docbook / db2rtf.dir / db2rtf.sh

diff --git a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
index 48b3521..544a0f4 100644 (file)
--- a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
+++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
@@ -1,17 +1,12 @@
-if [ -z "$SGML_CATALOG_FILES" ] ; then
-  for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do
-    if [ -n "$i" -a -r "$i" ] ;  then
-      SGML_CATALOG_FILES="$i"
-      break
-    fi
-  done
-fi
-
-if [ -z "$SGML_CATALOG_FILES" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] && [ ! -f "$SGML_CATALOG_FILES" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
 
+if [ -f "$DOCBOOK_CATALOG" ] ; then
+  CATALOG_OPTION="-c $DOCBOOK_CATALOG"
+fi
+
 output=db2rtf.rtf
 
 # Dave Mason's option to specify a different stylesheet
@@ -42,7 +37,7 @@ then
   fi
 fi
 
-cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print -c $SGML_CATALOG_FILES
+cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print $CATALOG_OPTION
 
 if [ $# -eq 1 ]
 then