X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=glafp-utils%2Fdocbook%2Fdb2rtf.dir%2Fdb2rtf.sh;h=3b32894e140b6eb354efbc326b566000ee8a8910;hb=07aea74a68e96f989a096c18addd87914a2181db;hp=9ed7e8f8586b898455e04c306c9ea14ff49ad7ea;hpb=17656ff2e85bd8503b521eacc93098d42488e0ec;p=ghc-hetmet.git

diff --git a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
index 9ed7e8f..3b32894 100644
--- a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
+++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
@@ -1,8 +1,12 @@
-if [ ! -f "$DOCBOOK_CATALOG" ] ; 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
@@ -33,7 +37,7 @@ then
   fi
 fi
 
-cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print -c $DOCBOOK_CATALOG
+cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print $CATALOG_OPTION
 
 if [ $# -eq 1 ]
 then