[FFmpeg-cvslog] doc/Makefile: install .3 man pages to man3 subdir

Stefano Sabatini git at videolan.org
Sun May 19 19:39:28 CEST 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat May 18 15:10:21 2013 +0200| [be3f4c13b6bbac135629268d84928bc513fe9511] | committer: Stefano Sabatini

doc/Makefile: install .3 man pages to man3 subdir

Fix trac ticket #2585.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be3f4c13b6bbac135629268d84928bc513fe9511
---

 doc/Makefile |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 1c1d9cd..cd24b8c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -14,7 +14,9 @@ COMPONENTS-$(CONFIG_AVFORMAT)   += ffmpeg-formats ffmpeg-protocols
 COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
 COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
 
-MANPAGES    = $(PROGS-yes:%=doc/%.1)    $(PROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)    $(LIBRARIES-yes:%=doc/%.3)
+MANPAGES1   = $(PROGS-yes:%=doc/%.1)    $(PROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
+MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
+MANPAGES    = $(MANPAGES1) $(MANPAGES3)
 PODPAGES    = $(PROGS-yes:%=doc/%.pod)  $(PROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
 HTMLPAGES   = $(PROGS-yes:%=doc/%.html) $(PROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
               doc/developer.html                                        \
@@ -93,13 +95,16 @@ install-progs-$(CONFIG_DOC): install-man
 
 install-man: $(MANPAGES)
 	$(Q)mkdir -p "$(MANDIR)/man1"
-	$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
+	$(INSTALL) -m 644 $(MANPAGES1) "$(MANDIR)/man1"
+	$(Q)mkdir -p "$(MANDIR)/man3"
+	$(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
 endif
 
 uninstall: uninstall-man
 
 uninstall-man:
-	$(RM) $(addprefix "$(MANDIR)/man1/",$(MANPAGES))
+	$(RM) $(addprefix "$(MANDIR)/man1/",$(MANPAGES1))
+	$(RM) $(addprefix "$(MANDIR)/man3/",$(MANPAGES3))
 
 clean:: docclean
 



More information about the ffmpeg-cvslog mailing list