X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=c086cc21cc4c6f53071cb8272ab8f0814c0ea63c;hb=875000f68adc598093312913ade3e2a68210b384;hp=d72e02b1e0cf278575ebbf6fcc925fc9283b49f5;hpb=36b99718212dde5ae1d17ec04268fbe24b72b1de;p=openwrt-10.03%2F.git

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index d72e02b1e..c086cc21c 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) \
@@ -99,6 +102,10 @@ MAKE_FLAGS = \
 	CROSS="$(TARGET_CROSS)" \
 	ARCH="$(ARCH)"
 
+MAKE_INSTALL_FLAGS = \
+	$(MAKE_FLAGS) \
+	DESTDIR="$(PKG_INSTALL_DIR)"
+
 MAKE_PATH = .
 
 define Build/Compile/Default
@@ -107,3 +114,10 @@ define Build/Compile/Default
 		$(MAKE_FLAGS) \
 		$(1);
 endef
+
+define Build/Install/Default
+	$(MAKE_VARS) \
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+		$(MAKE_INSTALL_FLAGS) \
+		$(1) install;
+endef