From 2d7d82d633bdf4d448ebb5551277dbe1f4bdcd1a Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 23 Jan 2014 02:13:40 +0000
Subject: [PATCH] [SCons] Install Python 3 module to stage directory

Cherry-pick of trunk r2671.
---
 SConstruct | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index 394f4f4d0..98a0d436d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1076,14 +1076,14 @@ addInstallActions = ('install' in COMMAND_LINE_TARGETS or
 # Directories where things will be staged for package creation. These
 # variables should always be used by the Install(...) targets
 if env['stage_dir']:
-    pp = env['python_prefix']
     instRoot = pjoin(os.getcwd(), env['stage_dir'],
                      stripDrive(env['prefix']).strip('/\\'))
-    if pp:
-        env['python_prefix'] = pjoin(os.getcwd(), env['stage_dir'],
-                                     stripDrive(pp).strip('/\\'))
-    else:
-        env['python_prefix'] = pjoin(os.getcwd(), env['stage_dir'])
+    for k in ('python_prefix', 'python3_prefix'):
+        if env[k]:
+            env[k] = pjoin(os.getcwd(), env['stage_dir'],
+                           stripDrive(env[k]).strip('/\\'))
+        else:
+            env[k] = pjoin(os.getcwd(), env['stage_dir'])
 else:
     instRoot = env['prefix']