[project @ 2000-05-31 13:22:25 by rrt]

Update to use DOCBOOK_CATALOG to get the correct catalog.

diff --git a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
index 1f59e70..fa9dcd6 100644 (file)
--- a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
+++ b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
@@ -1,13 +1,7 @@
-if [ -z "$SGML_CATALOG_FILES" ] ; then
-  for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do
-    if [ -n "$i" -a -r "$i" ] ;  then
-      SGML_CATALOG_FILES="$i"
-      break
-    fi
-  done
-fi
+DOCBOOK_CATALOG=$1
+shift
 
-if [ -z "$SGML_CATALOG_FILES" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
@@ -44,7 +38,7 @@ echo OUTPUT FILE NAME IS $output
 
 TMPFN=`echo $1 | sed 's/\.sgml//'`
 
-$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $SGML_CATALOG_FILES $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $DOCBOOK_CATALOG $1
 
 jadetex ${TMPFN}.tex
 

diff --git a/glafp-utils/docbook/db2html.dir/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh
index 383e127..6cdae0e 100644 (file)
--- a/glafp-utils/docbook/db2html.dir/db2html.sh
+++ b/glafp-utils/docbook/db2html.dir/db2html.sh
@@ -1,13 +1,7 @@
-if [ -z "$SGML_CATALOG_FILES" ] ; then
-  for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do
-    if [ -n "$i" -a -r "$i" ] ;  then
-      SGML_CATALOG_FILES="$i"
-      break
-    fi
-  done
-fi
+DOCBOOK_CATALOG=$1
+shift
 
-if [ -z "$SGML_CATALOG_FILES" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
@@ -62,10 +56,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 $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 ]

diff --git a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
index c7c259d..3dab674 100644 (file)
--- a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
+++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
@@ -1,13 +1,7 @@
-if [ -z "$SGML_CATALOG_FILES" ] ; then
-  for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do
-    if [ -n "$i" -a -r "$i" ] ;  then
-      SGML_CATALOG_FILES="$i"
-      break
-    fi
-  done
-fi
+DOCBOOK_CATALOG=$1
+shift
 
-if [ -z "$SGML_CATALOG_FILES" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
@@ -42,7 +36,7 @@ then
   fi
 fi
 
-$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $SGML_CATALOG_FILES $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $DOCBOOK_CATALOG $1
 
 pdf$JADEtex $TMPFN
 

diff --git a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
index 48b3521..947775f 100644 (file)
--- a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
+++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
@@ -1,13 +1,7 @@
-if [ -z "$SGML_CATALOG_FILES" ] ; then
-  for i in "$FPTOOLS_CATALOG_FILE" /usr/share/sgml/CATALOG.docbkdsl ; do
-    if [ -n "$i" -a -r "$i" ] ;  then
-      SGML_CATALOG_FILES="$i"
-      break
-    fi
-  done
-fi
+DOCBOOK_CATALOG=$1
+shift
 
-if [ -z "$SGML_CATALOG_FILES" ] ; then
+if [ ! -f "$DOCBOOK_CATALOG" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
@@ -42,7 +36,7 @@ then
   fi
 fi
 
-cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print -c $SGML_CATALOG_FILES
+cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print -c $DOCBOOK_CATALOG
 
 if [ $# -eq 1 ]
 then