From 1cbc384d5661d65c9509d341c938cd89f28dc061 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 14 Oct 2006 13:04:50 +0000 Subject: fix mistakes in unpack change git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5077 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 4 ++-- include/package.mk | 2 +- include/unpack.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/host-build.mk b/include/host-build.mk index 858eee531..0502d7682 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -8,9 +8,9 @@ include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk -ifneq ($(strip $(UNPACK)),) +ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default - $(UNPACK) + $(PKG_UNPACK) @if [ -d ./patches ]; then \ $(PATCH) $(PKG_BUILD_DIR) ./patches; \ fi diff --git a/include/package.mk b/include/package.mk index fc1b7802f..706b38d12 100644 --- a/include/package.mk +++ b/include/package.mk @@ -272,7 +272,7 @@ endef ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default - $(UNPACK) + $(PKG_UNPACK) @if [ -d ./patches ]; then \ $(PATCH) $(PKG_BUILD_DIR) ./patches; \ fi diff --git a/include/unpack.mk b/include/unpack.mk index 6449981c1..52764e492 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -1,13 +1,13 @@ ifeq ($(strip $(PKG_UNPACK)),) ifneq ($(strip $(PKG_CAT)),) # use existing PKG_CAT - UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - + PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ifeq ($(PKG_CAT),unzip) - UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) + PKG_UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) endif # replace zcat with $(ZCAT), because some system have it as gzcat ifeq ($(PKG_CAT),zcat) - UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - + PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - endif else # try to autodetect file type -- cgit v1.2.3