--- psiconv/trunk/formats/generate_html4.sh	2004/02/02 21:56:48	193
+++ psiconv/trunk/formats/generate_html4.sh	2004/04/29 21:43:28	250
@@ -1,17 +1,20 @@
 #! /bin/sh
 
+# Work around a BASH bug (prints a directory even in a non-interactive shell)
+unset CDPATH
+
 if test "$#" -lt 3 ; then
   echo "Syntax: $0 psiconv_dir output_dir files..."
   exit 1
 fi
 
-if ! test -d "$1"/program/psiconv ; then
+if test ! -d "$1"/program/psiconv ; then
   echo "First parameter should be base psiconv directory!"
   exit 1
 fi
 basedir=`cd $1; pwd`
 
-if ! test -d "$2" ; then
+if test ! -d "$2" ; then
   echo "Output directory does not exist!"
   exit 1
 fi
@@ -28,7 +31,8 @@
 tempdir=$outputdir/.temp
 mkindex=$basedir/formats/index_html.sh
 index=$tempdir/index
-mkdef=$basedir/formats/html_links.sh
+mkdef=$basedir/formats/html4_links.sh
+config="$basedir/formats/psiconv.conf"
 
 
 echo "Going to create the intermediate files..."
@@ -37,8 +41,8 @@
 for file in "$@"; do
   echo "Going to process $file..."
   outputfile=$tempdir/`basename $file|sed s,'.psi$','.html,'`
-  echo $libtool --mode=execute $psiconv -o $outputfile -Thtml4 -eASCII $file 
-  $libtool --mode=execute $psiconv -o $outputfile -Thtml4 -eASCII $file 
+  echo $libtool --mode=execute $psiconv -c $config -o $outputfile -Thtml4 -eASCII $file 
+  $libtool --mode=execute $psiconv -c $config -o $outputfile -Thtml4 -eASCII $file 
 done
 
 echo "Going to produce the index..."