From 1ba0deca7479ae63183221837beec76e73e2d893 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 26 Apr 2012 21:20:00 +0000 Subject: [PATCH] Fixed python module location in post-install message and setup_cantera script --- SConstruct | 2 +- platform/posix/SConscript | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 89994ecb3..dd7401278 100644 --- a/SConstruct +++ b/SConstruct @@ -925,7 +925,7 @@ env['inst_docdir'] = pjoin(instRoot, 'doc') env['inst_mandir'] = pjoin(instRoot, 'man1') env['inst_matlab_dir'] = pjoin(instRoot, 'matlab', 'toolbox') -env['python_module_loc'] = pjoin(env['prefix'], 'lib', +env['python_module_loc'] = pjoin(env['python_prefix'], 'lib', 'python%i.%i' % sys.version_info[:2], 'site-packages') diff --git a/platform/posix/SConscript b/platform/posix/SConscript index b96dce218..6719161ca 100644 --- a/platform/posix/SConscript +++ b/platform/posix/SConscript @@ -9,7 +9,8 @@ localenv = env.Clone() # 'setup_cantera' v = sys.version_info -localenv['python_module_loc'] = pjoin(localenv['prefix'], 'lib', 'python%i.%i' % v[:2], 'site-packages') +localenv['python_module_loc'] = pjoin(localenv['python_prefix'], 'lib', + 'python%i.%i' % v[:2], 'site-packages') target = build(localenv.SubstFile('setup_cantera', 'setup_cantera.in')) install('$inst_bindir', target)