Merge 3.2
diff --git a/Makefile.pre.in b/Makefile.pre.in
index c97c7ca..071c80b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1331,8 +1331,8 @@
# Find files with funny names
funny:
- find $(DISTDIRS) \
- -o -type d \
+ find $(SUBDIRS) $(SUBDIRSTOO) \
+ -type d \
-o -name '*.[chs]' \
-o -name '*.py' \
-o -name '*.pyw' \
@@ -1360,7 +1360,7 @@
-o -name .hgignore \
-o -name .bzrignore \
-o -name MANIFEST \
- -o -print
+ -print
# Perform some verification checks on any modified files.
patchcheck: