X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Funpack.mk;h=2cd17817e6929d216cf31acb1c8514848eb4ecfd;hb=32db1d47ff4cc198e0567b1e43e42ea9f9cae3a4;hp=ae8cdecb271ef1e760df78e365209a4cf4439c00;hpb=aa0778f77efb1d5c0d49e66a9d52ff438bc1ba7d;p=openwrt%2Fopenwrt.git

diff --git a/include/unpack.mk b/include/unpack.mk
index ae8cdecb27..2cd17817e6 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))
+  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))
+  HOST_UNPACK ?= $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR))
 endif
+
+endif # PKG_SOURCE
+