change the way ./files* and the generic kernel files are applied. ./files now applies...

[openwrt/svn-archive/archive.git] / include / quilt.mk

diff --git a/include/quilt.mk b/include/quilt.mk
index 70bc84e4cce6a56f4f6ca70becb30371ddc881a3..c569231173ed63cc0ab0890ed330a7c0e2e524fc 100644 (file)
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -68,11 +68,8 @@ endef
 
 define Kernel/Patch/Default
        rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches
-       if [ -d $(GENERIC_FILES_DIR) ]; then $(CP) $(GENERIC_FILES_DIR)/* $(LINUX_DIR)/; fi
-       if [ -d $(FILES_DIR) ]; then \
-               $(CP) $(FILES_DIR)/* $(LINUX_DIR)/; \
-               find $(LINUX_DIR)/ -name \*.rej | xargs rm -f; \
-       fi
+       $(CP) $(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.) $(LINUX_DIR)/
+       find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
        $(call PatchDir,$(GENERIC_PATCH_DIR),generic/)
        $(call PatchDir,$(PATCH_DIR),platform/)
 endef