fix make kernel_menuconfig (#1637)

[openwrt/svn-archive/archive.git] / include / package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3ec313bd94366a3924067f710c0ccdc58131d7e8..57f5ed7ef4a385bc4462f3d03821ec2c5367e24b 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -73,13 +73,14 @@ CONFIGURE_VARS = \
                PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 CONFIGURE_PATH = .
+CONFIGURE_CMD = ./configure
 
 define Build/Configure/Default
-       (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
-       if [ -x configure ]; then \
+       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
+       if [ -x $(CONFIGURE_CMD) ]; then \
                $(CONFIGURE_VARS) \
                $(2) \
-               $(CONFIGURE_PATH)/configure \
+               $(CONFIGURE_CMD) \
                $(CONFIGURE_ARGS) \
                $(1); \
        fi; \
@@ -96,9 +97,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