Issue #25825: Fix references to Modules/python.exp

These were incorrectly changed in revision 88a532a31eb3.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 3e56e422d78ad24f4911ede75a3582f92afd1bf0..dfc319b2ea737ce9f1a9c5cf70af4695b8d98c60 100644 (file)
--- 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 e6548c283abb99907d30a731d202b88ef32c1b65..5ee72c6f450395e2060f3d8e40ca0466b6e125c0 100644 (file)
--- 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.