diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-10-14 00:40:27 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-14 00:40:27 +0000 |
commit | 0d9ddef0e843133bd0cebdbfe141486fee4a6db8 (patch) | |
tree | 8aa331ac11110222623f5bf881856433d0b71682 /include/package.mk | |
parent | fdbd2f0907990c720505e4b3a1b18d1c470db7c8 (diff) | |
download | upstream-0d9ddef0e843133bd0cebdbfe141486fee4a6db8.tar.gz upstream-0d9ddef0e843133bd0cebdbfe141486fee4a6db8.tar.bz2 upstream-0d9ddef0e843133bd0cebdbfe141486fee4a6db8.zip |
move common unpacking code to unpack.mk, replace zcat with $(ZCAT) for systems that use gzcat instead
SVN-Revision: 5070
Diffstat (limited to 'include/package.mk')
-rw-r--r-- | include/package.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/package.mk b/include/package.mk index 5a9ba861af..fc1b7802f9 100644 --- a/include/package.mk +++ b/include/package.mk @@ -12,6 +12,7 @@ endif include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/unpack.mk define shvar V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) @@ -269,12 +270,7 @@ define BuildPackage endif endef -ifneq ($(strip $(PKG_CAT)),) - ifeq ($(PKG_CAT),unzip) - UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) - else - UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - - endif +ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default $(UNPACK) @if [ -d ./patches ]; then \ |