From: Felix Fietkau <nbd@openwrt.org>
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.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=8aa0ad2400f3f1eeea4a13e9a36ac3781e845a17;ds=sidebyside

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 d72e02b1e0..fd50cb4d81 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) \