From: nbd Date: Sun, 22 Feb 2009 18:27:53 +0000 (+0000) Subject: only define unpack templates if PKG_SOURCE is set X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=05c2bdffe4a0fa8a8b8debbe6941af46715eda64 only define unpack templates if PKG_SOURCE is set git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14623 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/unpack.mk b/include/unpack.mk index ae8cdecb2..e2810944e 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -16,7 +16,8 @@ UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE) ifeq ($(PKG_SOURCE),) PKG_UNPACK ?= true -endif +else + ifeq ($(strip $(UNPACK_CMD)),) ifeq ($(strip $(PKG_CAT)),) # try to autodetect file type @@ -64,9 +65,13 @@ ifeq ($(strip $(UNPACK_CMD)),) CRLF_CMD := endif endif + ifdef PKG_BUILD_DIR PKG_UNPACK := $(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR)) endif ifdef HOST_BUILD_DIR HOST_UNPACK := $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR)) endif + +endif # PKG_SOURCE +