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

(Patch by Ronald Oussoren)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e5c2a3f301fe2c5d22f89501db6675de77ec55ef..318bbadfbf4abfc2f742061eecfbc5a2aa65f6c4 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -937,6 +937,8 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
                unittest unittest/test \
                curses pydoc_data $(MACHDEPS)
 libinstall:    build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+       -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+               ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
        @for i in $(SCRIPTDIR) $(LIBDEST); \
        do \
                if test ! -d $(DESTDIR)$$i; then \
@@ -1014,8 +1016,6 @@ libinstall:       build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
                ./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
                -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-       -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-               ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
@@ -1256,7 +1256,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 Modules/_testembed
 
 profile-removal:

diff --git a/Misc/NEWS b/Misc/NEWS
index a9c96950f80e0b6112d9a5cf1d51e5fc747f0d1a..ae2ce66732cf8301b40681fb2173f3275256fdb8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -482,6 +482,8 @@ Tests
 Build
 -----
 
+- Issue #15645: Ensure 2to3 grammar pickles are properly installed.
+
 - Issue #15560: Fix building _sqlite3 extension on OS X with an SDK.
 
 - Issue #8847: Disable COMDAT folding in Windows PGO builds.