fix CONFIGURE_PATH and add MAKE_PATH

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6680 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3ec313bd94366a3924067f710c0ccdc58131d7e8..1316cfd32c91e023584f100b50489f46f15dbb0a 100644 (file)
--- 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)); \
 
 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 \
                $(CONFIGURE_VARS) \
                $(2) \
                $(CONFIGURE_PATH)/configure \


@@ -96,9 +96,11 @@ MAKE_FLAGS = \
        CROSS="$(TARGET_CROSS)" \
        ARCH="$(ARCH)"
 
        CROSS="$(TARGET_CROSS)" \
        ARCH="$(ARCH)"
 

+MAKE_PATH = .
+

 define Build/Compile/Default
        $(MAKE_VARS) \
 define Build/Compile/Default
        $(MAKE_VARS) \

-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \

                $(MAKE_FLAGS) \
                $(1);
 endef
                $(MAKE_FLAGS) \
                $(1);
 endef