X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fpackage-defaults.mk;h=877fff8338e7febe86a8b29f8cec06b2464fa552;hb=56d9da3f40ca69d57535d504159f75bf2ad582d6;hp=1316cfd32c91e023584f100b50489f46f15dbb0a;hpb=5d0a9887c8f9b61615baa7832609a2ba0061cc4c;p=openwrt-10.03%2F.git

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 1316cfd32..877fff833 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -33,12 +33,11 @@ define Package/Default
   DESCRIPTION:=
 endef
 
+Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
   	$(PKG_UNPACK)
-	@if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
-		$(PATCH) $(PKG_BUILD_DIR) ./patches; \
-	fi
+	$(Build/Patch)
   endef
 endif
 
@@ -73,13 +72,15 @@ CONFIGURE_VARS = \
 		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 CONFIGURE_PATH = .
+CONFIGURE_CMD = ./configure
 
 define Build/Configure/Default
-	(cd $(PKG_BUILD_DIR)/$(strip $(3)); \
-	if [ -x $(CONFIGURE_PATH)/configure ]; then \
+	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
+	if [ -x $(CONFIGURE_CMD) ]; then \
+		$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \
 		$(CONFIGURE_VARS) \
 		$(2) \
-		$(CONFIGURE_PATH)/configure \
+		$(CONFIGURE_CMD) \
 		$(CONFIGURE_ARGS) \
 		$(1); \
 	fi; \