[SCM] libav/experimental: Fix make install when PROGS is empty.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:08:40 UTC 2013


The following commit has been merged in the experimental branch:
commit 1217916b0dc4557801cea0627669787c86417913
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Oct 22 18:00:31 2007 +0000

    Fix make install when PROGS is empty.
    
    Originally committed as revision 10840 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index d3e0c7d..edce657 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,9 @@ ALL_TARGETS-$(BUILD_DOC)    += documentation
 
 INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
 INSTALL_TARGETS-$(BUILD_DOC)    += install-man
+ifneq ($(PROGS),)
+INSTALL_TARGETS-yes             += install-progs
+endif
 
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
@@ -137,7 +140,7 @@ doc/%.pod: doc/%-doc.texi
 doc/%.1: doc/%.pod
 	pod2man --section=1 --center=" " --release=" " $< > $@
 
-install: install-progs install-libs install-headers $(INSTALL_TARGETS-yes)
+install: install-libs install-headers $(INSTALL_TARGETS-yes)
 
 ifeq ($(BUILD_SHARED),yes)
 install-progs: install-libs

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list