Merged revisions 79075 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79075 | benjamin.peterson | 2010-03-18 17:58:19 -0500 (Thu, 18 Mar 2010) | 9 lines

  Merged revisions 79073 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79073 | benjamin.peterson | 2010-03-18 17:55:46 -0500 (Thu, 18 Mar 2010) | 1 line

    reignore bad_coding
  ........
................

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 82b056cee765099838864cba81c5a6c1b8a0beb8..e280dc46a84e1450d30a0a4a1977961b24c2e7b8 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -911,12 +911,12 @@ libinstall:       build_all $(srcdir)/Lib/$(PLATDIR)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
                ./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
                -d $(LIBDEST) -f \
-               -x 'badsyntax|site-packages|lib2to3/tests/data' \
+               -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                $(DESTDIR)$(LIBDEST)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                ./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
                -d $(LIBDEST) -f \
-               -x 'badsyntax|site-packages|lib2to3/tests/data' \
+               -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                $(DESTDIR)$(LIBDEST)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
                ./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \