[Python-checkins] cpython (merge 3.5 -> default): Issue #25825: Merge $(LIBPL) fix from 3.5

[martin.panter]

https://hg.python.org/cpython/rev/5a05c0eeefc3
changeset:   102928:5a05c0eeefc3
parent:      102927:72e034afeb55
parent:      102926:ca1ddd365f5f
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sat Aug 27 04:07:54 2016 +0000
summary:
  Issue #25825: Merge $(LIBPL) fix from 3.5

files:
  Misc/NEWS    |  6 ++++++
  configure    |  2 +-
  configure.ac |  2 +-
  3 files changed, 8 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,12 @@
 - Issue #27787: Call gc.collect() before checking each test for "dangling
   threads", since the dangling threads are weak references.
 
+Build
+-----
+
+- Issue #25825: Update references to the $(LIBPL) installation path on AIX.
+  This path was changed in 3.2a4.
+
 
 What's New in Python 3.6.0 alpha 4
 ==================================
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -9079,7 +9079,7 @@
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
 		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
-		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
+		LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
 		;;
 	IRIX/5*) LDSHARED="ld -shared";;
 	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2315,7 +2315,7 @@
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
 		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
-		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
+		LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
 		;;
 	IRIX/5*) LDSHARED="ld -shared";;
 	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;

-- 
Repository URL: https://hg.python.org/cpython