[vlc-commits] contrib: remove the contrib folder before unpacking the prebuilt

Steve Lhomme git at videolan.org
Fri Jun 19 09:06:21 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 17 09:04:27 2019 +0200| [d2b7d089f3ec518d49a02344b030e3dbb832953a] | committer: Steve Lhomme

contrib: remove the contrib folder before unpacking the prebuilt

In case it's the same folder we don't want to remove it after unpacking.

(cherry picked from commit 6061663719f53fbaf8e8885195de83942af60395)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/main.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 5000c5da4c..d6fdeb8402 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -476,8 +476,8 @@ vlc-contrib-$(HOST)-latest.tar.bz2:
 	$(call download,$(PREBUILT_URL))
 
 prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
-	-$(UNPACK)
 	$(RM) -r $(PREFIX)
+	-$(UNPACK)
 	mv $(HOST) $(TOPDST)
 	cd $(PREFIX) && $(SRC)/change_prefix.sh
 ifdef HAVE_WIN32



More information about the vlc-commits mailing list