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

These were incorrectly changed in revision 88a532a31eb3.
This commit is contained in:
Martin Panter 2016-08-12 13:21:05 +00:00
parent b4a2b36c99
commit 5401e87b01
2 changed files with 6 additions and 3 deletions

View File

@ -1407,10 +1407,10 @@ libainstall: all python-config
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config $(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 $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \ 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; \ $(DESTDIR)$(LIBPL)/python.exp; \
echo; echo "$(LIBPL)/python.exp"; \ echo; echo "$(LIBPL)/python.exp"; \
$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \ $(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
@ -1620,7 +1620,7 @@ distclean: clobber
done done
-rm -f core Makefile Makefile.pre config.status \ -rm -f core Makefile Makefile.pre config.status \
Modules/Setup Modules/Setup.local Modules/Setup.config \ 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 -rm -f python*-gdb.py
find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \ find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \
-o -name '[@,#]*' -o -name '*.old' \ -o -name '[@,#]*' -o -name '*.old' \

View File

@ -154,6 +154,9 @@ Windows
Build 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 - Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by
Chi Hsuan Yen. Chi Hsuan Yen.