[FFmpeg-devel] [PATCH] doc: fix install-doc dependencies

Stefano Sabatini stefasab at gmail.com
Thu Sep 5 17:26:02 CEST 2013


On date Sunday 2013-09-01 19:00:06 -0300, James Almer encoded:
> Put it inside its own ifdef conditional.
> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  doc/Makefile | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/Makefile b/doc/Makefile
> index a9b7ff4..47f5cbe 100644
> --- a/doc/Makefile
> +++ b/doc/Makefile
> @@ -88,15 +88,20 @@ $(DOCS) doc/doxy/html: | doc/
>  doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
>  	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
>  

> +install-doc:
> +
>  install-man:
>  
> -ifdef CONFIG_MANPAGES
> -install-progs-$(CONFIG_HTMLPAGES): install-doc
> -install-progs-$(CONFIG_DOC): install-man
> +ifdef CONFIG_HTMLPAGES
> +install-progs-$(CONFIG_DOC): install-doc
>  

>  install-doc: $(HTMLPAGES)
>  	$(Q)mkdir -p "$(DOCDIR)"
>  	$(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"

This should be probably named install-html, since "doc" refers to
documentation in general.

> +endif
> +
> +ifdef CONFIG_MANPAGES
> +install-progs-$(CONFIG_DOC): install-man
>  
>  install-man: $(MANPAGES)
>  	$(Q)mkdir -p "$(MANDIR)/man1"
-- 
FFmpeg = Fast & Fundamentalist Mystic Perfectionist Elected Goblin


More information about the ffmpeg-devel mailing list