Use the correct prefix for pdb.py. (Terrel Shumway)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@409 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 3002297b9f760f61aa2602853470a7b0b7ad3b24..8cc8060ffa1e016f79e67c2b8d1d534a90f4e771 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -148,6 +148,8 @@ RELEASE 0.08 -
   - Use a $PYTHON construction variable, initialized to sys.executable,
     when using Python to build parts of the SCons packages.
 
+  - Use sys.prefix, not sys.exec_prefix, to find pdb.py.
+
 
 
 RELEASE 0.07 - Thu,  2 May 2002 13:37:16 -0500

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 3040447ada3675d1e4ee73b598e8976ec1c7e745..306b89b27119ba147479a96956538da8e4bfb0ae 100644 (file)
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -475,10 +475,10 @@ def options_init():
             args = [ sys.executable, "pdb.py" ] + \
                      filter(lambda x: x != "--debug=pdb", sys.argv)
             if sys.platform == 'win32':
-                args[1] = os.path.join(sys.exec_prefix, "lib", "pdb.py")
+                args[1] = os.path.join(sys.prefix, "lib", "pdb.py")
                 sys.exit(os.spawnve(os.P_WAIT, args[0], args, os.environ))
             else:
-                args[1] = os.path.join(sys.exec_prefix,
+                args[1] = os.path.join(sys.prefix,
                                        "lib",
                                        "python" + sys.version[0:3],
                                       "pdb.py")