From 1345d201939fc7ce395d629834ed037e4697d8c5 Mon Sep 17 00:00:00 2001 From: "doko@ubuntu.com" Date: Mon, 13 Apr 2015 21:59:57 +0200 Subject: [PATCH] - Use PLATDIR for the platform directory everywhere (refactoring only) --- 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 index 76aef283e66..975aa1560b5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1123,7 +1123,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 01fb85ffc36..b60b5946f90 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) diff --git a/configure b/configure index 29cbd3614e2..1bb55ff3ea9 100755 --- a/configure +++ b/configure @@ -711,6 +711,7 @@ CFLAGS CC EXPORT_MACOSX_DEPLOYMENT_TARGET CONFIGURE_MACOSX_DEPLOYMENT_TARGET +PLATDIR SGI_ABI _PYTHON_HOST_PLATFORM MACHDEP @@ -3493,6 +3494,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 89692798273..d06d7742fba 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