[Python-checkins] cpython (merge 3.3 -> default): - Follow-up for issue #15484: In PYTHON_FOR_BUILD, use $(PLATDIR) instead

Sat Jan 26 12:09:48 CET 2013

http://hg.python.org/cpython/rev/938a045cfe7d
changeset: 81754:938a045cfe7d
parent: 81752:c0370730b364
parent: 81753:f0cde9b6830a
user: doko at python.org
date: Sat Jan 26 12:09:31 2013 +0100
summary:
 - Follow-up for issue #15484: In PYTHON_FOR_BUILD, use $(PLATDIR) instead
 of plat-$(MACHDEP).
files:
 configure | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -2946,7 +2946,7 @@
 	fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
 $as_echo "$interp" >&6; }
-	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
 as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,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])
-- 
Repository URL: http://hg.python.org/cpython
