From 8233b75041c4fca97dd71087ba888576be86a0f9 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 14 Nov 2006 02:53:59 +0000 Subject: [PATCH] Make man page installation dependent on documentation generation. Originally committed as revision 7042 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 734195c..c817e17 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ endif ifeq ($(BUILD_DOC),yes) DOC=documentation +INSTALLMAN=install-man endif OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o @@ -116,7 +117,7 @@ videohook: .libs documentation: $(MAKE) -C doc all -install: install-progs install-libs install-headers install-man $(INSTALLVHOOK) +install: install-progs install-libs install-headers $(INSTALLMAN) $(INSTALLVHOOK) ifeq ($(BUILD_SHARED),yes) install-progs: $(PROGS) install-libs @@ -130,12 +131,9 @@ endif wininstaller: all install makensis ffinstall.nsi -# install man from source dir if available install-man: - if [ -f doc/ffmpeg.1 ] ; then \ - install -d "$(mandir)/man1" ; \ - install -m 644 $(MANPAGES) "$(mandir)/man1" ; \ - fi + install -d "$(mandir)/man1" + install -m 644 $(MANPAGES) "$(mandir)/man1" install-vhook: $(MAKE) -C vhook install -- 2.7.4