diff options
| author | Ned Deily <nad@acm.org> | 2012-09-09 01:50:56 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2012-09-09 01:50:56 (GMT) |
| commit | 47bcfff26be59c3979778b4621cd61f132c1a6d9 (patch) | |
| tree | 3db9fce0f6647490f4d11f4d1d2dee7ee755baa3 /Makefile.pre.in | |
| parent | 14d66a98ed8674fd2e6ba2f04ddef694111011a2 (diff) | |
| download | cpython-47bcfff26be59c3979778b4621cd61f132c1a6d9.zip cpython-47bcfff26be59c3979778b4621cd61f132c1a6d9.tar.gz cpython-47bcfff26be59c3979778b4621cd61f132c1a6d9.tar.bz2 | |
Issue #15822: Fix installation of lib2to3 grammar pickles to ensure
they are created in the install locations and with the proper timestamp.
(Solution suggested by MvL)
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 5cb6774..6dec272 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -945,8 +945,6 @@ 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 \ @@ -1024,6 +1022,10 @@ 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) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(BUILDPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): @@ -1264,7 +1266,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 $(srcdir)/Lib/lib2to3/*Grammar*.pickle + -rm -f Lib/lib2to3/*Grammar*.pickle -rm -f Modules/_testembed profile-removal: |