- Use PLATDIR for the platform directory everywhere (refactoring only)
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 76aef28..975aa15 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1123,7 +1123,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
index 01fb85f..b60b594 100644
--- 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
index 29cbd36..1bb55ff 100755
--- a/configure
+++ b/configure
@@ -711,6 +711,7 @@
CC
EXPORT_MACOSX_DEPLOYMENT_TARGET
CONFIGURE_MACOSX_DEPLOYMENT_TARGET
+PLATDIR
SGI_ABI
_PYTHON_HOST_PLATFORM
MACHDEP
@@ -3493,6 +3494,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
index 8969279..d06d774 100644
--- 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