X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=glafp-utils%2Fdocbook%2Fdb2pdf.dir%2Fdb2pdf.sh;fp=glafp-utils%2Fdocbook%2Fdb2pdf.dir%2Fdb2pdf.sh;h=a5478aa25ce1b29674ee9cb60ac7837d8a0ab106;hb=07aea74a68e96f989a096c18addd87914a2181db;hp=82d67981324b957e4d29832b3dd4c84f86c74084;hpb=17656ff2e85bd8503b521eacc93098d42488e0ec;p=ghc-hetmet.git

diff --git a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
index 82d6798..a5478aa 100644
--- a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
+++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.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
+
 # Dave Mason's option to specify a different stylesheet
 case $1 in
     -d) DB_STYLESHEET=$2
@@ -31,7 +35,7 @@ then
   fi
 fi
 
-$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${output}.tex -c $DOCBOOK_CATALOG $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${output}.tex $CATALOG_OPTION $1
 
 jadetex ${output}