[5224] omit --split=node for sake of pre-5.0 installations

[karl]

Revision: 5224
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5224
Author:   karl
Date:     2013-03-08 23:10:39 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
omit --split=node for sake of pre-5.0 installations

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/gendocs.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-03-08 17:38:53 UTC (rev 5223)
+++ trunk/ChangeLog     2013-03-08 23:10:39 UTC (rev 5224)
@@ -1,3 +1,9 @@
+2013-03-08  Karl Berry  <address@hidden>
+
+       * util/gendocs.sh: omit --split=node for the sake of pre-5.0
+       installations.  Report to bug-gnulib from Martin von Gagern,
+       08 Mar 2013 19:20:36.
+
 2013-03-05  Patrice Dumas  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_close_current): close correctly stacks when

Modified: trunk/util/gendocs.sh
===================================================================
--- trunk/util/gendocs.sh       2013-03-08 17:38:53 UTC (rev 5223)
+++ trunk/util/gendocs.sh       2013-03-08 23:10:39 UTC (rev 5224)
@@ -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"