On 3/11/23 05:22, Arsen Arsenović wrote:
OK, changed up a bit, what do you think of this: maintainer-scripts/ChangeLog: * update_web_docs_git: Set CONTENTS_OUTPUT_LOCATION=inline in order to put @shortcontents above contents. See 9dd976a4-4e09-d901-b949-6d5037567...@codesourcery.com on gcc-patches. gcc/ChangeLog: * configure.ac: Add check for the Texinfo 6.8 CONTENTS_OUTPUT_LOCATION customization variable and set it if supported. * configure: Regenerate. * Makefile.in (MAKEINFO_TOC_INLINE_FLAG): New variable. Set by configure.ac to -c CONTENTS_OUTPUT_LOCATION=inline if CONTENTS_OUTPUT_LOCATION support is detected, empty otherwise. ($(build_htmldir)/%/index.html): Pass MAKEINFO_TOC_INLINE_FLAG. See 9dd976a4-4e09-d901-b949-6d5037567...@codesourcery.com on gcc-patches.
Hmmm, first off, I think somebody other than me needs to approve the configure and makefile pieces, as well as the maintainer-scripts part. It looks conceptually right to me, although I would add a comment to new configure.ac piece like
"Newer versions of Texinfo put the table of contents in the wrong place by default in HTML output, but provide a command-line option to restore the desired behavior. Check whether we need to do that."
I don't know whether the maintainer-scripts change needs to be made conditional too. :-S
BTW, this change probably needs to be backported to all active GCC branches (10, 11, and 12) too after it's committed to mainline.
-Sandra