summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-08-12 13:21:05 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-08-12 13:21:05 (GMT)
commit5401e87b01fb7d4d7797d5b49680db99e78fafb7 (patch)
tree108be85df383bebfbc41a4c663f759e84f6c4360
parentb4a2b36c9962f87c92f5f3a3c6326d4cf98ba73a (diff)
downloadcpython-5401e87b01fb7d4d7797d5b49680db99e78fafb7.zip
cpython-5401e87b01fb7d4d7797d5b49680db99e78fafb7.tar.gz
cpython-5401e87b01fb7d4d7797d5b49680db99e78fafb7.tar.bz2
Issue #25825: Fix references to Modules/python.exp
These were incorrectly changed in revision 88a532a31eb3.
-rw-r--r--Makefile.pre.in6
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 3e56e42..dfc319b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1407,10 +1407,10 @@ libainstall: all python-config
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
- @if [ -s Programs/python.exp -a \
+ @if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
- $(INSTALL_DATA) Programs/python.exp \
+ $(INSTALL_DATA) Modules/python.exp \
$(DESTDIR)$(LIBPL)/python.exp; \
echo; echo "$(LIBPL)/python.exp"; \
$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
@@ -1620,7 +1620,7 @@ distclean: clobber
done
-rm -f core Makefile Makefile.pre config.status \
Modules/Setup Modules/Setup.local Modules/Setup.config \
- Modules/ld_so_aix Programs/python.exp Misc/python.pc
+ Modules/ld_so_aix Modules/python.exp Misc/python.pc
-rm -f python*-gdb.py
find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \
-o -name '[@,#]*' -o -name '*.old' \
diff --git a/Misc/NEWS b/Misc/NEWS
index e6548c2..5ee72c6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -154,6 +154,9 @@ Windows
Build
-----
+- Issue #25825: Correct the references to Modules/python.exp, which is
+ required on AIX. The references were accidentally changed in 3.5.0a1.
+
- Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by
Chi Hsuan Yen.