summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-04-26 15:55:17 (GMT)
committerGitHub <noreply@github.com>2019-04-26 15:55:17 (GMT)
commit01f073f5e43329547471c846c37e23157255e30a (patch)
treeb9127ac055f7b6a2b7cd8cdb806cbbfb0d45edff /Makefile.pre.in
parentad0daf5b374dc43540d4ffcf32ca30e5c5147b90 (diff)
downloadcpython-01f073f5e43329547471c846c37e23157255e30a.zip
cpython-01f073f5e43329547471c846c37e23157255e30a.tar.gz
cpython-01f073f5e43329547471c846c37e23157255e30a.tar.bz2
bpo-21536: Revert Makefile change on python-config (GH-12971)
Misc/python-config.sh lives in the build directory, not in the source directory.
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index d06ad0b..89479ee 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,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py