[project @ 2002-03-25 15:56:00 by sof]

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

diff --git a/glafp-utils/docbook/db2html.dir/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh
index 421fa2e..c6ff8f9 100644 (file)
--- 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,17 +57,17 @@ 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 ]
 then
   if [ -d ${output}.junk ]
   then
-    /bin/rm -rf ${output}.junk
+    rm -rf ${output}.junk
   fi
   if [ -d ${output} ]
   then