diff options
author | Karl Berry <karl@freefriends.org> | 2013-03-08 15:24:22 -0800 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-03-08 15:24:22 -0800 |
commit | cc2981ec569dcbe10e4741d997c640676bbe2744 (patch) | |
tree | 363bda7f03c3305eb5b0d2a773c9edb4cb630d12 | |
parent | 167b9ca0ded4e13d5d4559809a4d01f1eddba11e (diff) | |
download | gnulib-cc2981ec569dcbe10e4741d997c640676bbe2744.tar.gz |
autoupdate
-rwxr-xr-x | build-aux/gendocs.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index e4bfc9fd2b..98c7523536 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -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 @@ if $generate_ascii; then 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 @@ if test -z "$use_texi2html"; then 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" |