From 75d681665a26ee9733542b8e5c32e9ba1bae4dcc Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 14 Oct 2006 00:40:27 +0000 Subject: 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 --- include/package.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'include/package.mk') 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 \ -- cgit v1.2.3