[vlc-commits] ios: Remove the contribs directory before installing new files

Martin Storsjö git at videolan.org
Sat Jul 27 19:27:48 CEST 2013


vlc/vlc-2.1 | branch: master | Martin Storsjö <martin at martin.st> | Mon Jul 22 21:09:12 2013 +0300| [fecea905835caa97d46a7a8594399ba6f70c2779] | committer: Felix Paul Kühne

ios: Remove the contribs directory before installing new files

If the contribs directory already existed, the source directory was
copied as a new subdirectory into that instead of replacing it
(which probably was what was intended).

This meant that the contribs directory in the install directory
wasn't ever updated in incremental builds unless explicitly
manually removed.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit d80e7c5923e634461d60681c5f0a1c44d26c8ca8)

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=fecea905835caa97d46a7a8594399ba6f70c2779
---

 extras/package/ios/build.sh |    1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c9fea60..5919682 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -326,6 +326,7 @@ info "Installing libvlc"
 make install > ${out}
 
 find ${PREFIX}/lib/vlc/plugins -name *.a -type f -exec cp '{}' ${PREFIX}/lib/vlc/plugins \;
+rm -rf "${PREFIX}/contribs"
 cp -R "${VLCROOT}/contrib/${TARGET}-${ARCH}" "${PREFIX}/contribs"
 
 info "Removing unneeded modules"



More information about the vlc-commits mailing list