[Python-checkins] cpython (merge 3.4 -> default): - merge 3.4

[matthias.klose]

https://hg.python.org/cpython/rev/3d3db6d11e8b
changeset:   95607:3d3db6d11e8b
parent:      95603:27128cb4fea0
parent:      95606:63c459e6bcf6
user:        doko at ubuntu.com
date:        Mon Apr 13 22:00:30 2015 +0200
summary:
   - merge 3.4

files:
  Makefile.pre.in    |  2 +-
  Modules/Setup.dist |  2 +-
  configure          |  4 ++++
  configure.ac       |  3 +++
  4 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1134,7 +1134,7 @@
 	(cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python3.1)
 
 # Install the library
-PLATDIR=	plat-$(MACHDEP)
+PLATDIR=	@PLATDIR@
 EXTRAPLATDIR= @EXTRAPLATDIR@
 MACHDEPS=	$(PLATDIR) $(EXTRAPLATDIR)
 XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -91,7 +91,7 @@
 TESTPATH=
 
 # Path components for machine- or system-dependent modules and shared libraries
-MACHDEPPATH=:plat-$(MACHDEP)
+MACHDEPPATH=:$(PLATDIR)
 EXTRAMACHDEPPATH=
 
 COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -712,6 +712,7 @@
 CC
 EXPORT_MACOSX_DEPLOYMENT_TARGET
 CONFIGURE_MACOSX_DEPLOYMENT_TARGET
+PLATDIR
 SGI_ABI
 _PYTHON_HOST_PLATFORM
 MACHDEP
@@ -3497,6 +3498,9 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP" >&5
 $as_echo "$MACHDEP" >&6; }
 
+
+PLATDIR=plat-$MACHDEP
+
 # Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
 # it may influence the way we can build extensions, so distutils
 # needs to check it
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -556,6 +556,9 @@
 fi
 AC_MSG_RESULT($MACHDEP)
 
+AC_SUBST(PLATDIR)
+PLATDIR=plat-$MACHDEP
+
 # Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
 # it may influence the way we can build extensions, so distutils
 # needs to check it

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