]> Savannah Git Hosting - gnulib.git/commitdiff
gendocs.sh: fix support for legacy --texi2html
authorPádraig Brady <P@draigBrady.com>
Sun, 17 Jun 2018 21:26:28 +0000 (14:26 -0700)
committerPádraig Brady <P@draigBrady.com>
Sun, 17 Jun 2018 21:30:06 +0000 (14:30 -0700)
* build-aux/gendocs.sh: Restrict use of TOP_NODE_UP_URL
to the default makeinfo invocation.
Reported by Bruce Korb

ChangeLog
build-aux/gendocs.sh

index 8a535382c2010c4cf48721a14f3f0c920e1c42d6..8f99c167fdb1a8b0e7670cb59bc8690c62fcff87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-17  Pádraig Brady  <P@draigBrady.com>
+
+       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  <bruno@clisp.org>
 
        gettext po infrastructure: Update from current gettext git.
index 9d418b945ab298026cc457a5949671c0c57e59a7..91c058dc76d0b5b9c7a3b467e892c2abc9b8938c 100755 (executable)
@@ -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"`