Merged revisions 79052 via svnmerge from

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

................
  r79052 | benjamin.peterson | 2010-03-18 16:23:05 -0500 (Thu, 18 Mar 2010) | 9 lines

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

  ........
    r79051 | benjamin.peterson | 2010-03-18 16:20:35 -0500 (Thu, 18 Mar 2010) | 1 line

    don't try to compile anything in lib2to3/tests/data #8169
  ........
................

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