summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.pre.in2
-rw-r--r--Misc/NEWS13
2 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index e3522f7..30fe44d 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 d19984a..886af22 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?
===========================