changeset:   102620:4d4b5b978b7e
parent:      102618:8c33152fd75c
parent:      102619:58c8cae6c61a
user:        Martin Panter <vadmium+py@gmail.com>
date:        Fri Aug 12 13:26:01 2016 +0000
files:       Makefile.pre.in Misc/NEWS
description:
Issue #25825: Merge AIX fix from 3.5


diff -r 8c33152fd75c -r 4d4b5b978b7e Makefile.pre.in
--- a/Makefile.pre.in	Fri Aug 12 12:05:48 2016 +0000
+++ b/Makefile.pre.in	Fri Aug 12 13:26:01 2016 +0000
@@ -1422,10 +1422,10 @@
 	$(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	\
@@ -1638,7 +1638,7 @@
 	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 -r 8c33152fd75c -r 4d4b5b978b7e Misc/NEWS
--- a/Misc/NEWS	Fri Aug 12 12:05:48 2016 +0000
+++ b/Misc/NEWS	Fri Aug 12 13:26:01 2016 +0000
@@ -116,6 +116,9 @@
 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.