From: Benjamin Peterson Date: Thu, 18 Mar 2010 21:25:12 +0000 (+0000) Subject: Merged revisions 79052 via svnmerge from X-Git-Tag: v3.1.2~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=903fc51649d05bae37a498d46ef3092076371254;p=python 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 2c19e15cea..d20fc344e9 100644 --- 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 \