provide default PKG_BUILD_DIR for packages missing a PKG_VERSION
authorNicolas Thill <nico@openwrt.org>
Mon, 3 Sep 2007 07:51:56 +0000 (07:51 +0000)
committerNicolas Thill <nico@openwrt.org>
Mon, 3 Sep 2007 07:51:56 +0000 (07:51 +0000)
SVN-Revision: 8583

include/kernel.mk
include/package.mk

index 00d1b8c..519ea42 100644 (file)
@@ -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 )
index 254588e..074c7ad 100644 (file)
@@ -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