summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-09-09 02:04:47 (GMT)
committerNed Deily <nad@acm.org>2012-09-09 02:04:47 (GMT)
commit4725b13ab335ff320eef8dc115941b8d34026023 (patch)
treeaa9b8b7e13955e6a658fc312530adb2fd575cbd7 /Makefile.pre.in
parentb59702223bcd014cd2adc747a407532d55423579 (diff)
downloadcpython-4725b13ab335ff320eef8dc115941b8d34026023.zip
cpython-4725b13ab335ff320eef8dc115941b8d34026023.tar.gz
cpython-4725b13ab335ff320eef8dc115941b8d34026023.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.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index cbc1f9e..af4fd81 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1024,8 +1024,6 @@ 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 \
@@ -1103,6 +1101,10 @@ 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) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
# Create the PLATDIR source directory, if one wasn't distributed..
$(srcdir)/Lib/$(PLATDIR):
@@ -1347,7 +1349,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 $(SYSCONFIGDATA)
-rm -f Modules/_testembed Modules/_freeze_importlib