diff --git a/SConstruct b/SConstruct index 15dd9420e..04611b75a 100644 --- a/SConstruct +++ b/SConstruct @@ -937,6 +937,8 @@ if env['python_package'] in ('full','default','new'): else: warnNoPython = False env['python_array_include'] = '' + env['python_module_loc'] = '' + env['install_python2_action'] = '' # Python 3 Package Settings diff --git a/src/matlab/SConscript b/src/matlab/SConscript index ab1503a23..871bd9ed6 100644 --- a/src/matlab/SConscript +++ b/src/matlab/SConscript @@ -78,15 +78,17 @@ env['matlab_extension'] = ctmethods ### Install the Matlab toolbox ### # 'ctpath.m' +globalenv = env 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'] + env['python_module_loc_sc'] = globalenv['python_module_loc'] target = localenv.SubstFile('#interfaces/matlab/ctpath.m', '#interfaces/matlab/ctpath.m.in') localenv.AddPreAction(target, copy_var) +localenv.Depends(target, env['install_python2_action']) install('$inst_matlab_dir', target) # 'cantera_demos.m'