[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/192e97dd5acf
changeset:   77657:192e97dd5acf
parent:      77656:b0c7e968bb68
parent:      77654:9c71d7f057b3
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Jun 24 00:20:26 2012 +0200
summary:
  Merge

files:
  PCbuild/pyproject.props |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <PyDllName>python33$(PyDebugExt)</PyDllName>
-    <PythonExe>$(SolutionDir)python$(PyDebugExt).exe</PythonExe>
+    <PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
     <KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
     <externalsDir>..\..</externalsDir>
     <sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>

-- 
Repository URL: http://hg.python.org/cpython