diff --git a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh index 013d07160d5a51bcbd8cf5e91d9c833e037afac5..1f59e708c8f458c0d3b60bbe9b6033458ec369e4 100644 --- a/glafp-utils/docbook/db2dvi.dir/db2dvi.sh +++ b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh @@ -1,11 +1,15 @@ -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 [ -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 + +if [ -z "$SGML_CATALOG_FILES" ] ; then + echo "CATALOG file not set up; see installation guide for details." + exit 1 fi # Dave Mason's option to specify a different stylesheet diff --git a/glafp-utils/docbook/db2html.dir/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh index b7337cb7dcc32e4020c2c5405a7329dc820deb71..383e1276b8579368a3a62eebb066a9c39017d3c8 100644 --- a/glafp-utils/docbook/db2html.dir/db2html.sh +++ b/glafp-utils/docbook/db2html.dir/db2html.sh @@ -1,11 +1,15 @@ -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 [ -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 + +if [ -z "$SGML_CATALOG_FILES" ] ; then + echo "CATALOG file not set up; see installation guide for details." + exit 1 fi HTML_STYLESHEET=$HTML_DIR/html/docbook.css diff --git a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh index 07f762aa74bc26a2422f6ce65633307722497b25..c7c259d27b5b2e14c9309d010ad601065cbdd8d5 100644 --- a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh +++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh @@ -1,11 +1,15 @@ -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 [ -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 + +if [ -z "$SGML_CATALOG_FILES" ] ; then + echo "CATALOG file not set up; see installation guide for details." + exit 1 fi TMPFN=`echo $1 | sed 's/\.sgml//'` diff --git a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh index dc90e49e3999f2c7002ac28f6fcc4750178bef18..48b352132533d9d3b6d9bb418a2bd7cec23d9221 100644 --- a/glafp-utils/docbook/db2rtf.dir/db2rtf.sh +++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh @@ -1,11 +1,15 @@ -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 [ -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 + +if [ -z "$SGML_CATALOG_FILES" ] ; then + echo "CATALOG file not set up; see installation guide for details." + exit 1 fi output=db2rtf.rtf