Re: gendocs broken?

[Pádraig Brady]

On 16/06/18 16:14, Bruce Korb wrote:
>> html_split> eval 'env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= texi2html
> --output gnu-pw-mgr.html --split=node --node-files
> --css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual
> "/u/gnu/proj/gnu-pw-mgr-bld/doc/gnu-pw-mgr.texi"'
>>> html_split> env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= texi2html
> --output gnu-pw-mgr.html --split=node --node-files
> --css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual
> /u/gnu/proj/gnu-pw-mgr-bld/doc/gnu-pw-mgr.texi
> Option c is ambiguous (check, conf-dir, css-include, css-ref)
> Try 'texi2html --help' for usage instructions.
> 
> 
> Using "-conf" seems to work
> 
> diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
> index 9d418b9..3a64a14 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=2018-03-06.19
> +scriptversion=2018-06-16.16
> 
>  # Copyright 2003-2018 Free Software Foundation, Inc.
>  #
> @@ -58,7 +58,7 @@ address@hidden  # please override with --email
>  commonarg= # passed to all makeinfo/texi2html invcations.
>  dirargs=   # passed to all tools (-I dir).
>  dirs=      # -I directories.
> -htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual"
> +htmlarg="--css-ref=/software/gnulib/manual.css -conf
> TOP_NODE_UP_URL=/manual"
>  infoarg=--no-split
>  generate_ascii=true
>  generate_html=true
> 
> 
Do you need to use texi2html ?
In any case -conf is not supported by texi2any or makeinfo.
Does the following work for you?

diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 9d418b9..91c058d 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -59,6 +59,7 @@ commonarg= # passed to all makeinfo/texi2html invcations.
 dirargs=   # passed to all tools (-I dir).
 dirs=      # -I directories.
 htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual"
+default_htmlarg=true
 infoarg=--no-split
 generate_ascii=true
 generate_html=true
@@ -163,7 +164,7 @@ while test $# -gt 0; do
     --common)    shift; commonarg=$1;;
     --docbook)   docbook=yes;;
     --email)     shift; EMAIL=$1;;
-    --html)      shift; htmlarg=$1;;
+    --html)      shift; default_htmlarg=false; htmlarg=$1;;
     --info)      shift; infoarg=$1;;
     --no-ascii)  generate_ascii=false;;
     --no-html)   generate_ascii=false;;
@@ -199,6 +200,11 @@ commonarg=" $dirargs $commonarg"
 # For most of the following, the base name is just $PACKAGE
 base=$PACKAGE

+if $default_htmlarg && test -n "$use_texi2html"; then
+  # The legacy texi2html doesn't support TOP_NODE_UP_URL
+  htmlarg="--css-ref=/software/gnulib/manual.css"
+fi
+
 if test -n "$srcfile"; then
   # but here, we use the basename of $srcfile
   base=`basename "$srcfile"`