diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-14 00:40:27 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-14 00:40:27 +0000 |
commit | f6777ece942ebd64b3ae43c3c939654577bfc6bd (patch) | |
tree | 5740afd664000225e2cfb54e51686fcf72ab0d66 /include/package.mk | |
parent | 79a17f08d7bd5640b46c51e32bdda9a80b4d329e (diff) |
move common unpacking code to unpack.mk, replace zcat with $(ZCAT) for systems that use gzcat instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5070 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 5a9ba861a..fc1b7802f 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 \ |