Merge branch 'mm/send-email-cc-cruft-after-address'

diff --git a/Makefile b/Makefile
index 4e3becb4980b1d83384eea2c3a67926101e4a044..9d6c24503155471cc66882f6ba2040456a1cf470 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -467,6 +467,7 @@ SPATCH = spatch
 export TCL_PATH TCLTK_PATH
 
 SPARSE_FLAGS =
+SPATCH_FLAGS = --all-includes
 
 
 
@@ -2315,7 +2316,7 @@ C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
 %.cocci.patch: %.cocci $(C_SOURCES)
        @echo '    ' SPATCH $<; \
        for f in $(C_SOURCES); do \
-               $(SPATCH) --sp-file $< $$f; \
+               $(SPATCH) --sp-file $< $$f $(SPATCH_FLAGS); \
        done >$@ 2>$@.log; \
        if test -s $@; \
        then \