[FFmpeg-devel] Re: [PATCH] doc/Makefile: add MAKEINFO variable

[Patrice Dumas via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

Hello,

Is there anything wrong with the patch?

The idea is to be able to use a different command than the system
makeinfo to generate the documentation, for example to use another
version.  My precise use case is that I test the customization code with
the development version of Texinfo, directly from the source directory.

On Sat, Jan 03, 2026 at 10:06:03PM +0100, Patrice Dumas via ffmpeg-devel wrote:
> 
> To allow building doc with another makeinfo command than the system one.
> 
> ---
>  doc/Makefile | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/Makefile b/doc/Makefile
> index 2112aff737..608759216c 100644
> --- a/doc/Makefile
> +++ b/doc/Makefile
> @@ -50,11 +50,12 @@ apidoc: doc/doxy/html
>  documentation: $(DOCS)
>  
>  TEXIDEP = perl $(SRC_PATH)/doc/texidep.pl $(SRC_PATH) $< $@ >$(@:%=%.d)
> +MAKEINFO = makeinfo
>  
>  doc/%.txt: TAG = TXT
>  doc/%.txt: doc/%.texi
>  	$(Q)$(TEXIDEP)
> -	$(M)makeinfo --force --no-headers -o $@ $< 2>/dev/null
> +	$(M)$(MAKEINFO) --force --no-headers -o $@ $< 2>/dev/null
>  
>  GENTEXI  = format codec
>  GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
> @@ -69,11 +70,11 @@ doc/%-all.html: TAG = HTML
>  ifdef HAVE_MAKEINFO_HTML
>  doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.pm $(GENTEXI)
>  	$(Q)$(TEXIDEP)
> -	$(M)makeinfo --html -I doc --no-split -D config-not-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $<
> +	$(M)$(MAKEINFO) --html -I doc --no-split -D config-not-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $<
>  
>  doc/%-all.html: doc/%.texi $(SRC_PATH)/doc/t2h.pm $(GENTEXI)
>  	$(Q)$(TEXIDEP)
> -	$(M)makeinfo --html -I doc --no-split -D config-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $<
> +	$(M)$(MAKEINFO) --html -I doc --no-split -D config-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $<
>  else
>  doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
>  	$(Q)$(TEXIDEP)
> -- 
> 2.51.0
> 
> _______________________________________________
> ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
> To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org