X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=glafp-utils%2Fdocbook%2Fdb2html.dir%2Fdb2html.sh;h=e5be4d67254431373cc0b8240721e890b3e41450;hb=07aea74a68e96f989a096c18addd87914a2181db;hp=1dc46b616ecde24693c97daa16be3cd05e128b2d;hpb=17656ff2e85bd8503b521eacc93098d42488e0ec;p=ghc-hetmet.git

diff --git a/glafp-utils/docbook/db2html.dir/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh
index 1dc46b6..e5be4d6 100644
--- a/glafp-utils/docbook/db2html.dir/db2html.sh
+++ b/glafp-utils/docbook/db2html.dir/db2html.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
+
 HTML_STYLESHEET=$HTML_DIR/html/docbook.css
 ADMON_GRAPHICS=$HTML_DIR/html/images/*.gif
 
@@ -53,10 +57,10 @@ mkdir $TMPDIR
 SAVE_PWD=`pwd`
 if [ $1 = `basename $1` ]; then
   echo "working on ../$1"
-  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG ../$1; cd $SAVE_PWD)
+  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html $CATALOG_OPTION ../$1; cd $SAVE_PWD)
 else
   echo "working on $1"
-  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG $1; cd $SAVE_PWD)
+  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html $CATALOG_OPTION $1; cd $SAVE_PWD)
 fi
 
 if [ $# -eq 1 ]