diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2015-04-13 20:00:30 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2015-04-13 20:00:30 (GMT) |
| commit | 4b761bf79a967bcb4e0079a99183bd06ba45b107 (patch) | |
| tree | 6369565b8f039c4dfec77b6718a34865932d0bc2 | |
| parent | 42db2f684c82942587cc9fe92b7e9c0325495f4f (diff) | |
| parent | 1345d201939fc7ce395d629834ed037e4697d8c5 (diff) | |
| download | cpython-4b761bf79a967bcb4e0079a99183bd06ba45b107.zip cpython-4b761bf79a967bcb4e0079a99183bd06ba45b107.tar.gz cpython-4b761bf79a967bcb4e0079a99183bd06ba45b107.tar.bz2 | |
- merge 3.4
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Modules/Setup.dist | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index d95653b..1c32ac7 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1134,7 +1134,7 @@ maninstall: altmaninstall (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 index 6e24eb0..06ba6ad 100644 --- a/Modules/Setup.dist +++ b/Modules/Setup.dist @@ -91,7 +91,7 @@ SITEPATH= TESTPATH= # Path components for machine- or system-dependent modules and shared libraries -MACHDEPPATH=:plat-$(MACHDEP) +MACHDEPPATH=:$(PLATDIR) EXTRAMACHDEPPATH= COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH) @@ -712,6 +712,7 @@ CFLAGS CC EXPORT_MACOSX_DEPLOYMENT_TARGET CONFIGURE_MACOSX_DEPLOYMENT_TARGET +PLATDIR SGI_ABI _PYTHON_HOST_PLATFORM MACHDEP @@ -3497,6 +3498,9 @@ fi { $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 index 6218bd2..69f7b7d 100644 --- a/configure.ac +++ b/configure.ac @@ -556,6 +556,9 @@ then 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 |