summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-16 19:18:55 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-16 19:18:55 +0000
commit1d3cff733d7f863871da68a81aeb52729dc314d4 (patch)
tree01e87355336d1a225ec19d98678fb72b6d09c38b /include
parentf8a9b434cecb4dced8268dc8518bb695b5a710a6 (diff)
add a default for PKG_BUILD_DIR and PKG_INSTALL_DIR (will use KERNEL_BUILD_DIR if kernel.mk is included, BUILD_DIR otherwise)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6580 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/kernel.mk2
-rw-r--r--include/package.mk3
2 files changed, 5 insertions, 0 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index 4cf0e7a72d..9792d04d0d 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -43,6 +43,8 @@ else
http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)
+ PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
endif
diff --git a/include/package.mk b/include/package.mk
index e9d73e4a06..44fe33ae1f 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -7,6 +7,9 @@
all: $(if $(DUMP),dumpinfo,compile)
+PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
+
include $(INCLUDE_DIR)/prereq.mk
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/unpack.mk