# HG changeset patch # User Karl Berry # Date 1362785062 28800 # Node ID 012da80674708c60d22a4fb80e790004a39f8219 # Parent b012a6ea32ac0b4fce0bfe18be4d16fe5f3ab697 autoupdate diff -r b012a6ea32ac -r 012da8067470 build-aux/gendocs.sh --- a/build-aux/gendocs.sh Fri Mar 08 09:45:29 2013 -0800 +++ b/build-aux/gendocs.sh Fri Mar 08 15:24:22 2013 -0800 @@ -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=2013-02-03.15 +scriptversion=2013-03-08.15 # Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 # Free Software Foundation, Inc. @@ -307,6 +307,7 @@ ls -l "$outdir/$PACKAGE.txt" "$outdir/$PACKAGE.txt.gz" fi +# Split HTML at level $1. Used for texi2html. html_split() { opt="--split=$1 --node-files $commonarg $htmlarg" @@ -339,7 +340,16 @@ mv $PACKAGE.html "$outdir/" ls -l "$outdir/$PACKAGE.html" "$outdir/$PACKAGE.html.gz" - opt="--html -o $PACKAGE.html --split=$split $commonarg $htmlarg" + # Before Texinfo 5.0, makeinfo did not accept a --split=HOW option, + # it just always split by node. So if we're splitting by node anyway, + # leave it out. + if test "x$split" = xnode; then + split_arg= + else + split_arg=--split=$split + fi + # + opt="--html -o $PACKAGE.html $split_arg $commonarg $htmlarg" cmd="$SETLANG $MAKEINFO $opt \"$srcfile\"" printf "\nGenerating html by $split... ($cmd)\n" eval "$cmd"