--- doc/help/render.texxml.pl	2002/07/16 20:45:05	1.1
+++ doc/help/render.texxml.pl	2002/07/19 17:00:05	1.4
@@ -29,7 +29,7 @@ use strict;
 use Fcntl;
 use POSIX qw(tmpnam);
 
-if ( scalar(@ARGV) < 2 and 0 )
+if ( scalar(@ARGV) < 2 )
 {
     print (<<USAGE);
 Usage: $0 texxml_file_name or
@@ -41,6 +41,9 @@ $0 renders texxml files into dvi files b
 resulting from from texxml2latex.pl and the referenced eps files
 into a temporary directory and running LaTeX on the .tex file.
 
+If a second argument is passed, it is used as the location of the 
+.eps files the document uses.
+
 Must be run as somebody with permissions to write temp files and 
 access /home/httpd/html/adm/help/eps.
 USAGE
@@ -50,7 +53,14 @@ USAGE
 
 my $tmpdir = tmpnam();
 my $fileroot = $ARGV[1];
-print $fileroot . "\n";
+my $epssource = "/home/httpd/html/adm/help/eps";
+
+if ( defined ( $ARGV[2] ) ) # override eps source, for build on install
+{
+    $epssource = $ARGV[2];
+}
+
+my $redir = ">& /dev/null"; # empty this for easier debugging
 
 mkdir $tmpdir;
 
@@ -58,18 +68,26 @@ print "Converting texxml to tex...\n";
 system ( "perl texxml2latex.pl $fileroot.texxml > $tmpdir/$fileroot.tex" );
 
 print "Copying .eps files...\n";
-system ( "cp /home/httpd/html/adm/help/eps/* $tmpdir/" );
+system ( "cp $epssource/* $tmpdir/" );
 
+# \scrollmode\input causes LaTeX to not stop on errors
 print "Running Latex...\n";
-system ( "cd $tmpdir; latex $fileroot >& /dev/null; latex $fileroot >& /dev/null; latex $fileroot >& /dev/null; " );
+system ( "cd $tmpdir; echo | latex $fileroot $redir; echo | latex $fileroot $redir; echo | latex $fileroot\ $redir; " );
 
-print "dvips...\n";
-system ( "cd $tmpdir; dvips -f $fileroot.dvi > $fileroot.ps " );
+print "Running dvips...\n";
+system ( "cd $tmpdir; dvips -f $fileroot.dvi > $fileroot.ps $redir " );
 
-print "Copying dvi file...\n";
+print "Copying ps file...\n";
 system ( "cp $tmpdir/$fileroot.ps .");
 
 print "Clearing temp directory...\n";
-system ( "rm -rf $tmpdir" );
+#system ( "rm -rf $tmpdir" );
 
-print "$fileroot.ps is ready, if all went well.\n";
+if ( -e $fileroot . ".ps" )
+{
+    print "$fileroot.ps is ready.\n";
+}
+else
+{
+    print "Generationr of $fileroot.ps failed.\n";
+}