--- gendocs.sh~	2007-01-09 20:16:52 +0100
+++ gendocs.sh	2007-01-07 09:43:07 +0100
@@ -2,7 +2,7 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2006-07-15.08
+scriptversion=2007-01-07.09
 
 # Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
@@ -31,6 +31,7 @@
 templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template"
 
 : ${MAKEINFO="makeinfo"}
+: ${TEXI2HTML="texi2html"}
 : ${TEXI2DVI="texi2dvi -t @finalout"}
 : ${DVIPS="dvips"}
 : ${DOCBOOK2TXT="docbook2txt"}
@@ -183,7 +184,7 @@
 ascii_gz_size=`calcsize $outdir/$PACKAGE.txt.gz`
 mv $PACKAGE.txt $outdir/
 
-cmd="${MAKEINFO} --no-split --html -o $PACKAGE.html $html \"$srcfile\""
+cmd="${TEXI2HTML} -o $PACKAGE.html $html \"$srcfile\""
 echo "Generating monolithic html... ($cmd)"
 rm -rf $PACKAGE.html  # in case a directory is left over
 eval "$cmd"
@@ -192,7 +194,7 @@
 html_mono_gz_size=`calcsize $outdir/$PACKAGE.html.gz`
 mv $PACKAGE.html $outdir/
 
-cmd="${MAKEINFO} --html -o $PACKAGE.html $html \"$srcfile\""
+cmd="${TEXI2HTML} --split=node --use-nodes --node-files --top-file=\"index.html\" -o $PACKAGE.html $html \"$srcfile\""
 echo "Generating html by node... ($cmd)"
 eval "$cmd"
 split_html_dir=$PACKAGE.html
@@ -201,9 +204,9 @@
   tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html
 )
 html_node_tgz_size=`calcsize $outdir/${PACKAGE}.html_node.tar.gz`
-rm -f $outdir/html_node/*.html
-mkdir -p $outdir/html_node/
-mv ${split_html_dir}/*.html $outdir/html_node/
+rm -f $outdir/${PACKAGE}/*.html
+mkdir -p $outdir/${PACKAGE}/
+mv ${split_html_dir}/*.html $outdir/${PACKAGE}/
 rmdir ${split_html_dir}
 
 echo Making .tar.gz for sources...
@@ -278,7 +281,7 @@
    -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \
    -e "s,%%SCRIPTURL%%,$scripturl,g" \
    -e "s!%%SCRIPTNAME%%!$prog!g" \
-$GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html
+$GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/${PACKAGE}.index.html
 
 echo "Done!  See $outdir/ subdirectory for new files."
 

Diff finished.  Tue Jan  9 20:17:01 2007