X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3d7b088997a372140d946c7e2ee9fdd3be9a0ee4..b40bc2899b2e399c07e4b0b1dda0f9cfcb9c8b5a:/include/unpack.mk diff --git a/include/unpack.mk b/include/unpack.mk index ae8cdecb2..2cd17817e 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 +