diff --git a/interfaces/matlab/ctpath.m.in b/interfaces/matlab/ctpath.m.in index a8c213f25..8bf84bdfa 100644 --- a/interfaces/matlab/ctpath.m.in +++ b/interfaces/matlab/ctpath.m.in @@ -1,4 +1,4 @@ path('@ct_matlab_dir@', path) path('@ct_matlab_dir@/1D', path) setenv('PYTHON_CMD', '@python_cmd@') -setenv('PYTHONPATH', [getenv('PYTHONPATH'), ':@python_module_loc@']) +setenv('PYTHONPATH', [getenv('PYTHONPATH'), ':@python_module_loc_sc@']) diff --git a/src/matlab/SConscript b/src/matlab/SConscript index 5e7a628ba..ab1503a23 100644 --- a/src/matlab/SConscript +++ b/src/matlab/SConscript @@ -78,8 +78,15 @@ env['matlab_extension'] = ctmethods ### Install the Matlab toolbox ### # 'ctpath.m' -target = build(localenv.SubstFile('#interfaces/matlab/ctpath.m', - '#interfaces/matlab/ctpath.m.in')) +def copy_var(target, source, env): + if env['python_prefix'] == 'USER': + env['python_module_loc_sc'] = '' + else: + env['python_module_loc_sc'] = env['python_module_loc'] + +target = localenv.SubstFile('#interfaces/matlab/ctpath.m', + '#interfaces/matlab/ctpath.m.in') +localenv.AddPreAction(target, copy_var) install('$inst_matlab_dir', target) # 'cantera_demos.m'