[FFmpeg-devel] [PATCH 2/3] doc: rename *install-doc to *install-html

[Michael Niedermayer]

On Fri, Sep 06, 2013 at 04:09:35PM -0300, James Almer wrote:
> On 06/09/13 10:39 AM, Michael Niedermayer wrote:
> > On Fri, Sep 06, 2013 at 10:39:29AM +0200, Stefano Sabatini wrote:
> >> On date Friday 2013-09-06 01:08:31 -0300, James Almer encoded:
> >>> Signed-off-by: James Almer <jamrial at gmail.com>
> >>> ---
> >>>  doc/Makefile | 10 +++++-----
> >>>  1 file changed, 5 insertions(+), 5 deletions(-)
> >>>
> >>> diff --git a/doc/Makefile b/doc/Makefile
> >>> index 47f5cbe..5671050 100644
> >>> --- a/doc/Makefile
> >>> +++ b/doc/Makefile
> >>> @@ -88,14 +88,14 @@ $(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-html:
> >>>  
> >>>  install-man:
> >>>  
> >>>  ifdef CONFIG_HTMLPAGES
> >>> -install-progs-$(CONFIG_DOC): install-doc
> >>> +install-progs-$(CONFIG_DOC): install-html
> >>>  
> >>> -install-doc: $(HTMLPAGES)
> >>> +install-html: $(HTMLPAGES)
> >>>  	$(Q)mkdir -p "$(DOCDIR)"
> >>>  	$(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
> >>>  endif
> >>> @@ -110,9 +110,9 @@ install-man: $(MANPAGES)
> >>>  	$(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
> >>>  endif
> >>>  
> >>> -uninstall: uninstall-doc uninstall-man
> >>> +uninstall: uninstall-html uninstall-man
> >>>  
> >>> -uninstall-doc:
> >>> +uninstall-html:
> >>>  	$(RM) -r "$(DOCDIR)"
> >>
> >> LGTM, thanks.
> > 
> > doesnt apply, so i cant push ...
> 
> This goes after the first patch i sent fixing the dependencies.

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Breaking DRM is a little like attempting to break through a door even
though the window is wide open and the only thing in the house is a bunch
of things you dont want and which you would get tomorrow for free anyway
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130907/ca9b0312/attachment.asc>