X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/800e84cc0ff36cfbc254ec9681d8731a4fd480f1..5c33cdcc411924285a1d55d64374dc3f358adac8:/include/unpack.mk?ds=sidebyside diff --git a/include/unpack.mk b/include/unpack.mk index ddd5fd11f..2cd17817e 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -16,8 +16,9 @@ UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE) ifeq ($(PKG_SOURCE),) PKG_UNPACK ?= true -endif -ifeq ($(strip $(PKG_UNPACK))$(strip $(HOST_UNPACK)),) +else + +ifeq ($(strip $(UNPACK_CMD)),) ifeq ($(strip $(PKG_CAT)),) # try to autodetect file type EXT:=$(call ext,$(PKG_SOURCE)) @@ -63,6 +64,14 @@ ifeq ($(strip $(PKG_UNPACK))$(strip $(HOST_UNPACK)),) else CRLF_CMD := endif - PKG_UNPACK := $(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR)) - HOST_UNPACK := $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR)) 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 +