Commit 57b5d92b authored by Uwe L. Korn's avatar Uwe L. Korn Committed by Jean-Baptiste Kempf

UNPACK_DIR should only strip .tar as 2nd suffix

Fixes the problem where UNPACK_DIR returned rtmpdump-2 instead
of rtmpdumo-2.3 for rtmpdump-2.3. Only .tar.* archives have two
filetype suffixes, tgz, zip,.. have only one and the second "."
in the filename belongs to the version number which should not be
stripped.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent aeea3853
...@@ -301,7 +301,7 @@ UNPACK = $(RM) -R $@ \ ...@@ -301,7 +301,7 @@ UNPACK = $(RM) -R $@ \
$(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \ $(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \
$(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f)) \ $(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f)) \
$(foreach f,$(filter %.zip,$^), && unzip $(f)) $(foreach f,$(filter %.zip,$^), && unzip $(f))
UNPACK_DIR = $(basename $(basename $(notdir $<))) UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
APPLY = (cd $(UNPACK_DIR) && patch -fp1) < APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1)) pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1))
MOVE = mv $(UNPACK_DIR) $@ && touch $@ MOVE = mv $(UNPACK_DIR) $@ && touch $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment