From 6a6fa5a4ab70f9f15f6f87fcf43a1588db612fe2 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 3 Sep 2007 07:51:56 +0000 Subject: [PATCH] provide default PKG_BUILD_DIR for packages missing a PKG_VERSION SVN-Revision: 8583 --- include/kernel.mk | 2 +- include/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/kernel.mk b/include/kernel.mk index 00d1b8c44c2..519ea42d23b 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 254588e8a04..074c7aded18 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 -- 2.30.2