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

[James Almer]

On 05/09/13 12:26 PM, Stefano Sabatini wrote:
> 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.

I thought about it, but didn't want to change things too much compared 
to how libav handles it so merges are hopefully less of a problem.

Ideally yes, that code should be install-html, and install-doc should
call install-html and install-man.
Same way with uninstall-*.

I'll send a patch later.

>> +endif
>> +
>> +ifdef CONFIG_MANPAGES
>> +install-progs-$(CONFIG_DOC): install-man
>>  
>>  install-man: $(MANPAGES)
>>  	$(Q)mkdir -p "$(MANDIR)/man1"