Skip to content

C
cpython
Kaydet (Commit) 4b761bf7 authored tarafından doko@ubuntu.com's avatar doko@ubuntu.com
Dosyalara gözat
Seçenekler

- merge 3.4

üst 42db2f68 1345d201
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
Makefile.pre.in
Dosyayı görüntüle @ 4b761bf7
...@@ -1134,7 +1134,7 @@ maninstall: altmaninstall ...@@ -1134,7 +1134,7 @@ maninstall: altmaninstall
(cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python3.1) (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python3.1)
# Install the library # Install the library
PLATDIR= plat-$(MACHDEP) PLATDIR= @PLATDIR@
EXTRAPLATDIR= @EXTRAPLATDIR@ EXTRAPLATDIR= @EXTRAPLATDIR@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR) MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
......
Modules/Setup.dist
Dosyayı görüntüle @ 4b761bf7
...@@ -91,7 +91,7 @@ SITEPATH= ...@@ -91,7 +91,7 @@ SITEPATH=
TESTPATH= TESTPATH=
# Path components for machine- or system-dependent modules and shared libraries # Path components for machine- or system-dependent modules and shared libraries
MACHDEPPATH=:plat-$(MACHDEP) MACHDEPPATH=:$(PLATDIR)
EXTRAMACHDEPPATH= EXTRAMACHDEPPATH=
COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH) COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)
......
configure
Dosyayı görüntüle @ 4b761bf7
...@@ -712,6 +712,7 @@ CFLAGS ...@@ -712,6 +712,7 @@ CFLAGS
CC CC
EXPORT_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET
CONFIGURE_MACOSX_DEPLOYMENT_TARGET CONFIGURE_MACOSX_DEPLOYMENT_TARGET
PLATDIR
SGI_ABI SGI_ABI
_PYTHON_HOST_PLATFORM _PYTHON_HOST_PLATFORM
MACHDEP MACHDEP
...@@ -3497,6 +3498,9 @@ fi ...@@ -3497,6 +3498,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP" >&5
$as_echo "$MACHDEP" >&6; } $as_echo "$MACHDEP" >&6; }
PLATDIR=plat-$MACHDEP
# Record the configure-time value of MACOSX_DEPLOYMENT_TARGET, # Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
# it may influence the way we can build extensions, so distutils # it may influence the way we can build extensions, so distutils
# needs to check it # needs to check it
......
configure.ac
Dosyayı görüntüle @ 4b761bf7
...@@ -556,6 +556,9 @@ then ...@@ -556,6 +556,9 @@ then
fi fi
AC_MSG_RESULT($MACHDEP) AC_MSG_RESULT($MACHDEP)
AC_SUBST(PLATDIR)
PLATDIR=plat-$MACHDEP
# Record the configure-time value of MACOSX_DEPLOYMENT_TARGET, # Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
# it may influence the way we can build extensions, so distutils # it may influence the way we can build extensions, so distutils
# needs to check it # needs to check it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment