Issue #15645: Ensure 2to3 grammar pickles are properly installed.

(Patch by Ronald Oussoren)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index adffa03865f4b8ef48b9927c27954f38a7725144..f715711d9e328156603fe8e87864e43826bfa52d 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1017,6 +1017,8 @@ LIBSUBDIRS=       tkinter tkinter/test tkinter/test/test_tkinter \
                venv venv/scripts venv/scripts/posix \
                curses pydoc_data $(MACHDEPS)
 libinstall:    build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+       -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+               $(PYTHON_FOR_BUILD) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
        @for i in $(SCRIPTDIR) $(LIBDEST); \
        do \
                if test ! -d $(DESTDIR)$$i; then \
@@ -1094,8 +1096,6 @@ libinstall:       build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
                $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
                -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-       -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-               $(PYTHON_FOR_BUILD) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
@@ -1340,7 +1340,7 @@ clean: pycremoval
        find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
        find build -name 'fficonfig.h' -exec rm -f {} ';' || true
        find build -name 'fficonfig.py' -exec rm -f {} ';' || true
-       -rm -f Lib/lib2to3/*Grammar*.pickle
+       -rm -f $(srcdir)/Lib/lib2to3/*Grammar*.pickle
        -rm -f $(SYSCONFIGDATA)
        -rm -f Modules/_testembed Modules/_freeze_importlib
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 16442cca911fe3c5032f168a68781c5887642886..2b872d2ee4fc235bdba0c2a8ad6abb8b2a7f5f07 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -105,6 +105,11 @@ Tests
 - Issue #15615: Add some tests for the json module's handling of invalid
   input data.  Patch by Kushal Das.
 
+Build
+-----
+
+- Issue #15645: Ensure 2to3 grammar pickles are properly installed.
+
 
 What's New in Python 3.3.0 Beta 2?
 ==================================