[SCons] Install Python 3 module to stage directory

Cherry-pick of trunk r2671.
This commit is contained in:
Ray Speth 2014-01-23 02:13:40 +00:00
parent 5109d0d5a4
commit 2d7d82d633

View file

@ -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']