From b80cc10aeb8dd2b94bf0be2a5d0b2efb95965e24 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?=
Date: Sun, 17 Jun 2018 14:26:28 -0700
Subject: [PATCH] gendocs.sh: fix support for legacy --texi2html
* build-aux/gendocs.sh: Restrict use of TOP_NODE_UP_URL
to the default makeinfo invocation.
Reported by Bruce Korb
---
ChangeLog | 7 +++++++
build-aux/gendocs.sh | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8a535382c2..8f99c167fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-17 Pádraig Brady
+
+ gendocs.sh: fix support for legacy --texi2html
+ * build-aux/gendocs.sh: Restrict use of TOP_NODE_UP_URL
+ to the default makeinfo invocation.
+ Reported by Bruce Korb
+
2018-06-17 Bruno Haible
gettext po infrastructure: Update from current gettext git.
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 9d418b945a..91c058dc76 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"`
--
2.39.5