From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 5 Aug 2008 18:02:54 +0000 (+0000)
Subject: replace config.guess and config.sub properly, even if they are in a subdirectory
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=680b9628750e2f234193da3c7e9a2ee9a8ef3ae7

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


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

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index d72e02b1e..fd50cb4d8 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -76,10 +76,13 @@ CONFIGURE_VARS = \
 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 \
-		$(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) \