Re: [PATCH] Fix html build with makeinfo 5.2

[Corinna Vinschen <vinschen at redhat dot com>]

On Aug 19 09:10, Thomas Preudhomme wrote:
> HTML build fails with makeinfo 5.2 with the following error:
> 
> libgloss/doc/porting.texi:73: @menu seen before first @node
> libgloss/doc/porting.texi:73: perhaps your @top node should be wrapped in
> @ifnottex rather than @ifinfo?
> 
> Following the advice indeed solve the issue while still allowing pdf, dvi
> and info builds to work.
> 
> 
> diff --git a/libgloss/doc/porting.texi b/libgloss/doc/porting.texi
> index 9e1d9286e8c858e9a4982ea4efc0ceab206a119c..9beda39e5a0434817b4b3fb224d2c74831740a58
> 100644
> --- a/libgloss/doc/porting.texi
> +++ b/libgloss/doc/porting.texi
> @@ -39,7 +39,7 @@ Permission is granted to copy and distribute translations
> of this manual
>  into another language, under the above conditions for modified versions.
>  @end titlepage
> 
> -@ifinfo
> +@ifnottex
>  @format
>  START-INFO-DIR-ENTRY
>  * Embed with GNU: (porting-).         Embed with GNU
> @@ -62,7 +62,7 @@ into another language, under the above conditions for
> modified versions.
>  @node Top
>  @top Embed with GNU
> 
> -@end ifinfo
> +@end ifnottex
>  @strong{Rough Draft}
> 
>  The goal of this document is to gather all the information needed to
> 
> 
> Is this ok for master branch?

Yes, but this patch again didn't apply cleanly.  This time it wasn't
overly tricky to fix it, so I pushed it, but there are at least two
problems in your patches:

- Unexpected line breaks for long lines

- `git am' chokes on the permission bits in line3:

    Applying: Fix html build with makeinfo 5.2
    fatal: patch with only garbage at line 3
    Patch failed at 0001 Fix html build with makeinfo 5.2
    [...]

Please attach your patches instead of inlining them and, ideally,
please send them in `git format-patch' format.


Thank you,
Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

Attachment: signature.asc
Description: PGP signature