[project @ 2001-04-23 16:49:59 by sewardj]

[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 b7337cb..1dc46b6 100644 (file)
--- a/glafp-utils/docbook/db2html.dir/db2html.sh
+++ b/glafp-utils/docbook/db2html.dir/db2html.sh
@@ -1,11 +1,6 @@
-if [ -z "$SGML_CATALOG_FILES"]
-then
-  if [ ! -f "$FPTOOLS_CATALOG_FILE" ]
-  then
-    echo "CATALOG file not set up; see installation guide for details."
-    exit 1
-  fi
-  SGML_CATALOG_FILES=$FPTOOLS_CATALOG_FILE
+if [ ! -f "$DOCBOOK_CATALOG" ] ; then
+  echo "CATALOG file not set up; see installation guide for details."
+  exit 1
 fi
 
 HTML_STYLESHEET=$HTML_DIR/html/docbook.css
@@ -58,17 +53,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 $SGML_CATALOG_FILES ../$1; cd $SAVE_PWD)
+  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG ../$1; cd $SAVE_PWD)
 else
   echo "working on $1"
-  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $SGML_CATALOG_FILES $1; cd $SAVE_PWD)
+  (cd $TMPDIR; $JADE -t sgml -ihtml -d ${DB_STYLESHEET}\#html -c $DOCBOOK_CATALOG $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