Sandra Loosemore <sandra.loosem...@siemens.com> writes: > 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."
This sounds good, will drop in. Who can review these? > I don't know whether the maintainer-scripts change needs to be made > conditional > too. :-S I don't think so, I was thinking of omitting it for the usual build too since it's a nonfatal error to pass non-existent customization variables, but I decided that this would introduce too much noise to the normal path. This shouldn't emit a warning on the server that runs the update anyway since, hopefully, we'd be updating it 7.0dev for the other goodies. > BTW, this change probably needs to be backported to all active GCC branches > (10, 11, and 12) too after it's committed to mainline. I'm not opposed to doing that. > -Sandra -- Arsen Arsenović
signature.asc
Description: PGP signature
