bug#22651: [PATCH] gendocs.sh: Set default TOP_NODE_UP_URL in HTML output.

2016-05-07 Thread Ludovic Courtès
Suggested by Gavin Smith .
Reported by myglc2  in .

* build-aux/gendocs.sh (MANUAL_TITLE, PACKAGE, EMAIL)
(commonarg, dirargs, dirs, infoarg, generate_ascii)
(generate_html, generate_info, generate_tex, outdir)
(source_extra, split, srcfile, texarg): Move above 'version'.
(htmlarg): Likewise, and add "-c TOP_NODE_UP_URL=/manual".
---
 build-aux/gendocs.sh | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 1d1e1e7..ef55fbe 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=2016-01-01.00
+scriptversion=2016-05-07.19
 
 # Copyright 2003-2016 Free Software Foundation, Inc.
 #
@@ -52,6 +52,24 @@ 
templateurl="http://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/gendocs_templ
 unset CDPATH
 unset use_texi2html
 
+MANUAL_TITLE=
+PACKAGE=
+EMAIL=webmast...@gnu.org  # 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"
+infoarg=--no-split
+generate_ascii=true
+generate_html=true
+generate_info=true
+generate_tex=true
+outdir=manual
+source_extra=
+split=node
+srcfile=
+texarg="-t @finalout"
+
 version="gendocs.sh $scriptversion
 
 Copyright 2016 Free Software Foundation, Inc.
@@ -74,7 +92,7 @@ Options:
   -I DIR   append DIR to the Texinfo search path.
   --common ARG pass ARG in all invocations.
   --html ARG   pass ARG to makeinfo or texi2html for HTML targets,
- instead of --css-ref=/software/gnulib/manual.css.
+ instead of '$htmlarg'.
   --info ARG   pass ARG to makeinfo for Info, instead of --no-split.
   --no-ascii   skip generating the plain text output.
   --no-htmlskip generating the html output.
@@ -137,24 +155,6 @@ SETLANG setting in the source.
 Email bug reports or enhancement requests to bug-gnu...@gnu.org.
 "
 
-MANUAL_TITLE=
-PACKAGE=
-EMAIL=webmast...@gnu.org  # 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
-infoarg=--no-split
-generate_ascii=true
-generate_html=true
-generate_info=true
-generate_tex=true
-outdir=manual
-source_extra=
-split=node
-srcfile=
-texarg="-t @finalout"
-
 while test $# -gt 0; do
   case $1 in
 -s)  shift; srcfile=$1;;
-- 
2.7.4






bug#22651: [PATCH] gendocs.sh: Fix "dir" link in HTML output

2016-05-07 Thread Ludovic Courtès
Hello!

This patch aims to fix “dir” links in HTML output, as discussed at
.

If there are no objections, I’d like to commit it within a couple
of days.

Thanks,
Ludo’.

Ludovic Courtès (1):
  gendocs.sh: Set default TOP_NODE_UP_URL in HTML output.

 build-aux/gendocs.sh | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

-- 
2.7.4