X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=glafp-utils%2Fdocbook%2Fdb2pdf.dir%2Fdb2pdf.sh;h=47f8e07ab1c40d33dcb13a071a4f33bb207b6ac6;hb=11e3e5747e70d4aa1e2507a14d55d3757249995a;hp=3dab6742f4fc22f6d776c21229c566151ed69924;hpb=c04238f0d36aee3b7fecd71c857743b67e3de457;p=ghc-hetmet.git

diff --git a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
index 3dab674..47f8e07 100644
--- a/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
+++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
@@ -1,13 +1,8 @@
-DOCBOOK_CATALOG=$1
-shift
-
 if [ ! -f "$DOCBOOK_CATALOG" ] ; then
   echo "CATALOG file not set up; see installation guide for details."
   exit 1
 fi
 
-TMPFN=`echo $1 | sed 's/\.sgml//'`
-
 # Dave Mason's option to specify a different stylesheet
 case $1 in
     -d) DB_STYLESHEET=$2
@@ -32,18 +27,27 @@ then
   fi
   if echo $1 | egrep -i '\.sgml$|\.sgm$' >/dev/null 2>&1
   then
-    output="`echo $1 | sed 's,\.sgml$,.pdf,;s,\.sgm$,.pdf,'`"
+    output="`echo $1 | sed 's,\.sgml$,,;s,\.sgm$,,'`"
   fi
 fi
 
-$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex -c $DOCBOOK_CATALOG $1
+# assumption: openjade and pdfjadetex is installed in the same dir.
+PDFJADETEX=`dirname $JADE`/pdfjadetex
 
-pdf$JADEtex $TMPFN
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${output}.tex -c $DOCBOOK_CATALOG $1
 
+${PDFJADETEX} ${output}
+
+# See if running pdfjadetex twice cures the problem.
 if egrep '^LaTeX Warning: There were undefined references.$' ${TMPFN}.log >/dev/null 2>&1
 then
-  pdfjadetex $TMPFN
-  pdfjadetex $TMPFN
+  ${PDFJADETEX} ${output}
+  ${PDFJADETEX} ${output}
 fi
 
+# clean out 
+rm -f ${output}.log
+rm -f ${output}.aux
+rm -f ${output}.tex
+
 exit 0