X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fquilt.mk;h=9691dc3276c68dc8664ac38bd73d7c6afff1e628;hb=aaf16819a137571c64bbe0854a727989764aa943;hp=1bbe9d6ee2142f83dad4498983bdf1e4304a8b2c;hpb=5f3470d6fe9de1b23a5332fd051d729330695726;p=openwrt.git

diff --git a/include/quilt.mk b/include/quilt.mk
index 1bbe9d6ee2..9691dc3276 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -40,11 +40,12 @@ endef
 
 define PatchDir/Default
 	@if [ -d "$(2)" -a "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
+		export PATCH="$(PATCH)"; \
 		if [ -s "$(2)/series" ]; then \
 			$(call filter_series,$(2)/series) | xargs -n1 \
-				$(PATCH) "$(1)" "$(2)"; \
+				$(KPATCH) "$(1)" "$(2)"; \
 		else \
-			$(PATCH) "$(1)" "$(2)"; \
+			$(KPATCH) "$(1)" "$(2)"; \
 		fi; \
 	fi
 endef
@@ -100,8 +101,8 @@ define Quilt/RefreshDir
 	mkdir -p $(2)
 	-rm -f $(2)/* 2>/dev/null >/dev/null
 	@( \
-		for patch in $$$$($(if $(3),grep "^$(3)",cat) $(PKG_BUILD_DIR)/patches/series | awk '{print $$$$1}'); do \
-			$(CP) -v "$(PKG_BUILD_DIR)/patches/$$$$patch" $(2); \
+		for patch in $$$$($(if $(3),grep "^$(3)",cat) $(1)/patches/series | awk '{print $$$$1}'); do \
+			$(CP) -v "$(1)/patches/$$$$patch" $(2); \
 		done; \
 	)
 endef