diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-22 18:10:05 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-22 18:10:05 +0000 |
| commit | 3d7b088997a372140d946c7e2ee9fdd3be9a0ee4 (patch) | |
| tree | f54d34013647c394c84def03480e123fc0f9bd6e /include/unpack.mk | |
| parent | ca3f76d2a5a2f330b12be5dcd9d41e6a30648981 (diff) | |
allow concurrent use of host-build.mk and package.mk as well as their templates
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14621 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/unpack.mk')
| -rw-r--r-- | include/unpack.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/unpack.mk b/include/unpack.mk index ddd5fd11f..ae8cdecb2 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -17,7 +17,7 @@ UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE) ifeq ($(PKG_SOURCE),) PKG_UNPACK ?= true endif -ifeq ($(strip $(PKG_UNPACK))$(strip $(HOST_UNPACK)),) +ifeq ($(strip $(UNPACK_CMD)),) ifeq ($(strip $(PKG_CAT)),) # try to autodetect file type EXT:=$(call ext,$(PKG_SOURCE)) @@ -63,6 +63,10 @@ ifeq ($(strip $(PKG_UNPACK))$(strip $(HOST_UNPACK)),) else 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 |