- Use PLATDIR for the platform directory everywhere (refactoring only)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 76aef283e66292bd3c30987277c857fc0bb4f215..975aa1560b5866cc1513dfae3076070371184b2e 100644 (file)
--- 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 01fb85ffc368a54da954a584ed4f54302d21139b..b60b5946f90a193eba3fc1bdcb12c16fb2f4d5c0 100644 (file)
--- 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 29cbd3614e26d011628016b4ef60ad48b8836cd6..1bb55ff3ea9b62e668c6722d82e4940d67888145 100755 (executable)
--- 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 89692798273da6826d9f57b8071aa570464c8ec1..d06d7742fba473402a2d839cd2fa1641ea236dd8 100644 (file)
--- 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