diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-09-03 07:51:56 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-09-03 07:51:56 +0000 |
| commit | bddd540035df0569392e7d0a6c59903d27687b89 (patch) | |
| tree | a051b423e3da8f2404a35b942b744d9d164fc1a5 | |
| parent | e346573fe7c9d42e6153fa749a7dc61dbcb084e4 (diff) | |
| download | master-187ad058-bddd540035df0569392e7d0a6c59903d27687b89.tar.gz master-187ad058-bddd540035df0569392e7d0a6c59903d27687b89.tar.bz2 master-187ad058-bddd540035df0569392e7d0a6c59903d27687b89.zip | |
provide default PKG_BUILD_DIR for packages missing a PKG_VERSION
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8583 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel.mk | 2 | ||||
| -rw-r--r-- | include/package.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 00d1b8c44c..519ea42d23 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -44,7 +44,7 @@ else TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,) LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) \ - PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) endif GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL) GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) diff --git a/include/package.mk b/include/package.mk index 254588e8a0..074c7aded1 100644 --- a/include/package.mk +++ b/include/package.mk @@ -7,7 +7,7 @@ all: $(if $(DUMP),dumpinfo,compile) -PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install PKG_MD5SUM ?= unknown |