* [FFmpeg-devel] [PATCH] doc/Makefile: add MAKEINFO variable
@ 2026-01-03 21:06 Patrice Dumas via ffmpeg-devel
2026-01-10 22:05 ` [FFmpeg-devel] " Patrice Dumas via ffmpeg-devel
0 siblings, 1 reply; 2+ messages in thread
From: Patrice Dumas via ffmpeg-devel @ 2026-01-03 21:06 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Patrice Dumas
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [FFmpeg-devel] Re: [PATCH] doc/Makefile: add MAKEINFO variable
2026-01-03 21:06 [FFmpeg-devel] [PATCH] doc/Makefile: add MAKEINFO variable Patrice Dumas via ffmpeg-devel
@ 2026-01-10 22:05 ` Patrice Dumas via ffmpeg-devel
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Dumas via ffmpeg-devel @ 2026-01-10 22:05 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Patrice Dumas
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-01-10 22:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-03 21:06 [FFmpeg-devel] [PATCH] doc/Makefile: add MAKEINFO variable Patrice Dumas via ffmpeg-devel
2026-01-10 22:05 ` [FFmpeg-devel] " Patrice Dumas via ffmpeg-devel
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git