X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4eff8fed4cd6f7e357090d971b3156567be93957..d1ca5112f809c744af5f76ddd901880287bc98d3:/include/package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3ec313bd9..c0e13f412 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -31,14 +31,14 @@ define Package/Default
   SUBMENUDEP:=
   TITLE:=
   DESCRIPTION:=
+  KCONFIG:=
 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 +73,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 ]; 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; \
@@ -96,9 +98,11 @@ MAKE_FLAGS = \
 	CROSS="$(TARGET_CROSS)" \
 	ARCH="$(ARCH)"
 
+MAKE_PATH = .
+
 define Build/Compile/Default
 	$(MAKE_VARS) \
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
 		$(MAKE_FLAGS) \
 		$(1);
 endef