X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Funpack.mk;h=9b68e5dea39d1e97b9722f1735c4f40d736054e1;hb=9050c1c2192c90c142a24743c00c4c79462bd609;hp=b8349c9ca46d13e9f4ecf7792f97d3a0f7e4d471;hpb=e90cdd3990f76ee8561d98e49ef2719fa5311489;p=openwrt-10.03%2F.git diff --git a/include/unpack.mk b/include/unpack.mk index b8349c9ca..9b68e5dea 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -1,4 +1,9 @@ -ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1))) +# +# Copyright (C) 2006-2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # unpacking files with +s may break on some platforms. this typically emits error code 2 ifneq ($(HOST_OS),Linux) @@ -20,7 +25,7 @@ ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(filter gz tgz,$(EXT)),$(EXT)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) - UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | + UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | endif ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT)) EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=)) @@ -48,9 +53,9 @@ ifeq ($(strip $(PKG_UNPACK)),) ifeq ($(PKG_CAT),unzip) PKG_UNPACK:=$(UNZIP_CMD) endif - # replace zcat with $(ZCAT), because some system have it as gzcat + # replace zcat with $(ZCAT), because some system don't support it properly ifeq ($(PKG_CAT),zcat) - PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) + PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD) endif endif ifneq ($(strip $(CRLF_WORKAROUND)),)