[Python-checkins] bpo-21536: Revert Makefile change on python-config (GH-12971)

Victor Stinner webhook-mailer at python.org
Fri Apr 26 11:56:21 EDT 2019


https://github.com/python/cpython/commit/01f073f5e43329547471c846c37e23157255e30a
commit: 01f073f5e43329547471c846c37e23157255e30a
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-04-26T17:55:17+02:00
summary:

bpo-21536: Revert Makefile change on python-config (GH-12971)

Misc/python-config.sh lives in the build directory, not in the source
directory.

files:
M Makefile.pre.in

diff --git a/Makefile.pre.in b/Makefile.pre.in
index d06ad0bc939c..89479ee7f1a3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1460,7 +1460,9 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
 
-python-config: $(srcdir)/Misc/python-config.in $(srcdir)/Misc/python-config.sh
+# bpo-21536: Misc/python-config.sh is generated in the build directory
+# from $(srcdir)Misc/python-config.sh.in.
+python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
 	@ # Substitution happens here, as the completely-expanded BINDIR
 	@ # is not available in configure
 	sed -e "s, at EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py



More information about the Python-checkins mailing list