[vlc-commits] contrib: x264: Fix build by using UNPACK_DIR

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Fri Mar 22 08:06:37 2019 +0100| [f87092a889ea00f60e6c34140a5fbf807eac0626] | committer: Steve Lhomme

contrib: x264: Fix build by using UNPACK_DIR

UNPACK_DIR instead of x264-git is expected for the following
contrib macros (UPDATE_AUTOCONFIG, APPLY).

Fixes build on macOS.

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/x264/rules.mak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 49ca5ab508..68472cb957 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -84,12 +84,12 @@ $(TARBALLS)/$(X264_BASENAME):
 .sum-x264: $(X264_BASENAME)
 
 x264 x26410b: %: $(X264_BASENAME) .sum-%
-	rm -Rf $*-git
-	mkdir -p $*-git
-	tar xvjfo "$<" --strip-components=1 -C $*-git
+	rm -Rf $(UNPACK_DIR)
+	mkdir -p $(UNPACK_DIR)
+	tar xvjfo "$<" --strip-components=1 -C $(UNPACK_DIR)
 	$(UPDATE_AUTOCONFIG)
 	$(APPLY) $(SRC)/x264/x264-winstore.patch
-	mv $*-git $*
+	$(MOVE)
 
 x262: x262-git.tar.gz .sum-x262
 	rm -Rf $@-git