summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-24 21:05:56 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-24 21:05:56 +0000
commit5d0a9887c8f9b61615baa7832609a2ba0061cc4c (patch)
treedc89bea282d168dec795ab4bbd243e419e4eeab1
parent4eff8fed4cd6f7e357090d971b3156567be93957 (diff)
fix CONFIGURE_PATH and add MAKE_PATH
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6680 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-defaults.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3ec313bd9..1316cfd32 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -76,7 +76,7 @@ CONFIGURE_PATH = .
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(strip $(3)); \
- if [ -x configure ]; then \
+ if [ -x $(CONFIGURE_PATH)/configure ]; then \
$(CONFIGURE_VARS) \
$(2) \
$(CONFIGURE_PATH)/configure \
@@ -96,9 +96,11 @@ MAKE_FLAGS = \
CROSS="$(TARGET_CROSS)" \
ARCH="$(ARCH)"
+MAKE_PATH = .
+
define Build/Compile/Default
$(MAKE_VARS) \
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_FLAGS) \
$(1);
endef