[FFmpeg-cvslog] build: fix install rule with --progs-suffix.

Clément Bœsch git at videolan.org
Sun Sep 11 01:49:31 CEST 2011


ffmpeg | branch: master | Clément Bœsch <clement.boesch at smartjog.com> | Tue Sep  6 15:48:14 2011 +0200| [c975cfaef24cc2f32d08efd363af5bbf9b3a6119] | committer: Clément Bœsch

build: fix install rule with --progs-suffix.

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

 Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index ef1f3d4..09bdfb1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ PROGS-$(CONFIG_FFPROBE)  += ffprobe
 PROGS-$(CONFIG_FFSERVER) += ffserver
 
 PROGS      := $(PROGS-yes:%=%$(EXESUF))
+INSTPROGS   = $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF))
 OBJS        = $(PROGS-yes:%=%.o) cmdutils.o
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
 HOSTPROGS  := $(TESTTOOLS:%=tests/%)
@@ -116,7 +117,7 @@ install-progs-$(CONFIG_SHARED): install-libs
 
 install-progs: install-progs-yes $(PROGS)
 	$(Q)mkdir -p "$(BINDIR)"
-	$(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
+	$(INSTALL) -c -m 755 $(INSTPROGS) "$(BINDIR)"
 
 install-data: $(DATA_FILES)
 	$(Q)mkdir -p "$(DATADIR)"



More information about the ffmpeg-cvslog mailing list