replace config.guess and config.sub properly, even if they are in a subdirectory

SVN-Revision: 12148

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index d72e02b1e0cf278575ebbf6fcc925fc9283b49f5..fd50cb4d81d9c569cefdada108843dd45bd21fba 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -76,10 +76,13 @@ CONFIGURE_VARS = \
 CONFIGURE_PATH = .
 CONFIGURE_CMD = ./configure
 
 CONFIGURE_PATH = .
 CONFIGURE_CMD = ./configure
 

+replace_script=$(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2);
+

 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
        if [ -x $(CONFIGURE_CMD) ]; then \
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
        if [ -x $(CONFIGURE_CMD) ]; then \

-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \
+               $(call replace_script,$(PKG_BUILD_DIR)/$(3),config.guess) \
+               $(call replace_script,$(PKG_BUILD_DIR)/$(3),config.sub) \

                $(CONFIGURE_VARS) \
                $(2) \
                $(CONFIGURE_CMD) \
                $(CONFIGURE_VARS) \
                $(2) \
                $(CONFIGURE_CMD) \