From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 18 Mar 2010 21:23:05 +0000 (+0000)
Subject: Merged revisions 79051 via svnmerge from
X-Git-Tag: v3.2a1~1432
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=249683fab330004ee54087afc8c95732f0c7f983;p=python

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 1af8f165dc..19a399ab2b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -912,12 +912,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 \