[Python-checkins] cpython (merge 3.4 -> 3.5): - Issue #25440: Fix output of python-config --extension-suffix.

[matthias.klose]

https://hg.python.org/cpython/rev/40aba0cda7b6
changeset:   98789:40aba0cda7b6
branch:      3.5
parent:      98786:530846c3ebb4
parent:      98788:74b6b19e52b4
user:        doko at ubuntu.com
date:        Mon Oct 19 14:13:35 2015 +0200
summary:
  - Issue #25440: Fix output of python-config --extension-suffix.

files:
  Misc/NEWS                |  5 +++++
  Misc/python-config.sh.in |  2 +-
  2 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1041,12 +1041,17 @@
 Tools/Demos
 -----------
 
+<<<<<<< local
 - Issue #24000: Improved Argument Clinic's mapping of converters to legacy
   "format units".  Updated the documentation to match.
 
 - Issue #24001: Argument Clinic converters now use accept={type}
   instead of types={'type'} to specify the types the converter accepts.
 
+=======
+- Issue #25440: Fix output of python-config --extension-suffix.
+
+>>>>>>> other
 - Issue #23330: h2py now supports arbitrary filenames in #include.
 
 - Issue #24031: make patchcheck now supports git checkouts, too.
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
@@ -49,7 +49,7 @@
 LDVERSION="@LDVERSION@"
 LIBDEST=${prefix}/lib/python${VERSION}
 LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
-SO="@SO@"
+SO="@EXT_SUFFIX@"
 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
 INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
 PLATINCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"

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