[Python-checkins] cpython (2.7): - Use PLATDIR for the platform directory everywhere (refactoring only)
matthias.klose
python-checkins at python.org
Mon Apr 13 22:00:38 CEST 2015
https://hg.python.org/cpython/rev/009a90c4226e
changeset: 95604:009a90c4226e
branch: 2.7
parent: 95599:df662d2548a3
user: doko at ubuntu.com
date: Mon Apr 13 21:55:08 2015 +0200
summary:
- Use PLATDIR for the platform directory everywhere (refactoring only)
files:
Makefile.pre.in | 2 +-
Modules/Setup.dist | 2 +-
configure.ac | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -946,7 +946,7 @@
(cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python2.1 python.1)
# Install the library
-PLATDIR= plat-$(MACHDEP)
+PLATDIR= @PLATDIR@
EXTRAPLATDIR= @EXTRAPLATDIR@
EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
--- 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=
# Path component for the Tkinter-related modules
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
fi
elif test "$cross_compiling" = maybe; then
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
@@ -493,6 +493,9 @@
fi
AC_MSG_RESULT($MACHDEP)
+AC_SUBST(PLATDIR)
+PLATDIR=plat-$MACHDEP
+
# And add extra plat-mac for darwin
AC_SUBST(EXTRAPLATDIR)
AC_SUBST(EXTRAMACHDEPPATH)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list