prevent include/netfilter.mk from being included multiple times

[openwrt-10.03/.git] / include / quilt.mk

diff --git a/include/quilt.mk b/include/quilt.mk
index 3a6f0dc754ea78fa68d596ae1b5e2f77a5b9579b..a2cbdf9eeb49a5a472d43508eb53ce91f53b631f 100644 (file)
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -5,7 +5,7 @@
 # See /LICENSE for more information.
 #
 
-ifeq ($(KERNEL_BUILD),1)
+ifeq ($(TARGET_BUILD),1)
   PKG_BUILD_DIR:=$(LINUX_DIR)
 endif
 PATCH_DIR?=./patches
@@ -15,7 +15,7 @@ ifeq ($(MAKECMDGOALS),refresh)
 endif
 
 define Quilt/Patch
-       @for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
+       @for patch in $$$$( (cd $(1) && if [ -f series ]; then grep -v '^#' series; else ls; fi; ) 2>/dev/null ); do ( \
                cp "$(1)/$$$$patch" $(PKG_BUILD_DIR); \
                cd $(PKG_BUILD_DIR); \
                quilt import -P$(2)$$$$patch -p 1 "$$$$patch"; \
@@ -59,7 +59,7 @@ define Kernel/Patch/Default
        $(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
-ifeq ($(KERNEL_BUILD),1)
+ifeq ($(TARGET_BUILD),1)
 $(STAMP_PATCHED): $(STAMP_PREPARED)
        @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
        (\