From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 1 Aug 2008 14:15:22 +0000 (+0000)
Subject: Merged revisions 65368 via svnmerge from
X-Git-Tag: v3.0b3~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fe5ed8f258652c22b182f22478f5edb42f71382;p=python

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

........
  r65368 | martin.v.loewis | 2008-08-01 16:10:26 +0200 (Fr, 01 Aug 2008) | 3 lines

  Generate the PatternGrammar pickle during "make install".
  Fixes part of #3131.
........
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e3522f7e2f..30fe44dad5 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -890,7 +890,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
 		-d $(LIBDEST)/site-packages -f \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram"
+		./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
diff --git a/Misc/NEWS b/Misc/NEWS
index d19984aad3..886af2254a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,9 +26,22 @@ Library
   file name rather than a ZipInfo instance, so files are extracted with
   mode 0600 rather than 000 under Unix.
 
+<<<<<<< .working
 - Issue #2523: Fix quadratic behaviour when read()ing a binary file without
   asking for a specific length.
+=======
+Build
+-----
+>>>>>>> .merge-right.r65368
+
+<<<<<<< .working
+=======
+- Generate the PatternGrammar pickle during "make install".
+
 
+What's New in Python 2.6 beta 2?
+================================
+>>>>>>> .merge-right.r65368
 
 What's new in Python 3.0b2?
 ===========================