diff --git a/interfaces/cython/SConscript b/interfaces/cython/SConscript index e07ea2888..23e9c8163 100644 --- a/interfaces/cython/SConscript +++ b/interfaces/cython/SConscript @@ -25,7 +25,7 @@ def configure_numpy(python_command): def add_dependencies(mod, ext): localenv.Depends(mod, ext) localenv.Depends(ext, localenv['cantera_staticlib']) - localenv.Depends(mod, dataFiles + testFiles) + localenv.Depends(mod, dataFiles + testFiles + scripts) for f in mglob(localenv, 'cantera', 'pyx', 'pxd'): localenv.Depends(ext, f) @@ -56,10 +56,12 @@ build(env.Command('cantera/ck2cti.py', Copy('$TARGET', '$SOURCE'))) # thin wrappers +scripts = [] for script in mglob(env, 'scripts', 'py.in'): base_name = script.name.split('.')[0] - build(env.Command('scripts/%s%s' % (base_name, script_ext), script, - Copy('$TARGET', '$SOURCE'))) + script = build(env.Command('scripts/%s%s' % (base_name, script_ext), script, + Copy('$TARGET', '$SOURCE'))) + scripts.append(script) def install_module(prefix, python_version): if prefix == 'USER': @@ -89,6 +91,8 @@ def install_module(prefix, python_version): global_env['python%s_module_loc' % ver] = os.path.normpath(filename) break localenv.AlwaysBuild(localenv.AddPostAction(mod_inst, find_module_dir)) + if not ver: + env['install_python2_action'] = mod_inst elif localenv['PYTHON_INSTALLER'] == 'debian': install(localenv.Command, dummy, mod, diff --git a/platform/posix/SConscript b/platform/posix/SConscript index f12c0aa77..797e6a069 100644 --- a/platform/posix/SConscript +++ b/platform/posix/SConscript @@ -19,6 +19,7 @@ if localenv['layout'] != 'debian': target = env.SubstFile('setup_cantera', 'setup_cantera.in') localenv.AddPreAction(target, copy_var) + localenv.Depends(target, env['install_python2_action']) install('$inst_bindir', target) # 'mixmaster' diff --git a/src/python/SConscript b/src/python/SConscript index f876f706e..d114baf51 100644 --- a/src/python/SConscript +++ b/src/python/SConscript @@ -100,6 +100,7 @@ if localenv['PYTHON_INSTALLER'] == 'direct': global_env['python_module_loc'] = os.path.normpath(filename) break localenv.AlwaysBuild(localenv.AddPostAction(mod_inst, find_module_dir)) + env['install_python2_action'] = mod_inst elif localenv['PYTHON_INSTALLER'] == 'debian': install(localenv.Command, 'dummy', pymodule,