[vlc-commits] extras/tools: Fix UNPACK_DIR for single extensions

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sat Nov 11 02:18:38 2017 +0100| [4e216e1a683ca528517aa91094d73cc9c2db46ac] | committer: Rémi Denis-Courmont

extras/tools: Fix UNPACK_DIR for single extensions

This is copy-pasted from the contrib main.mak

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/tools/tools.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index c6cfa0f7a7..56688314cb 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -37,7 +37,7 @@ UNPACK = $(RM) -R $@ \
     $(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f)) \
     $(foreach f,$(filter %.zip,$^), && unzip $(f))
 
-UNPACK_DIR = $(basename $(basename $(notdir $<)))
+UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -p1) <
 MOVE = mv $(UNPACK_DIR) $@ && touch $@