From 32d5d7b8b2c2a401951310af8a1e3934d615fb13 Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Tue, 26 Aug 2014 22:04:50 +0000 Subject: [PATCH] [Matlab] Fix build warnings about Contents.m --- .gitignore | 2 +- interfaces/matlab/{toolbox => }/Contents.m.in | 0 src/matlab/SConscript | 7 +++---- 3 files changed, 4 insertions(+), 5 deletions(-) rename interfaces/matlab/{toolbox => }/Contents.m.in (100%) diff --git a/.gitignore b/.gitignore index aa233f8ae..ad9243bfe 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ build/ test/work/ include/cantera/base/config.h interfaces/matlab/ctpath.m -interfaces/matlab/toolbox/Contents.m +interfaces/matlab/Contents.m stage/ .sconsign.dblite .sconf_temp diff --git a/interfaces/matlab/toolbox/Contents.m.in b/interfaces/matlab/Contents.m.in similarity index 100% rename from interfaces/matlab/toolbox/Contents.m.in rename to interfaces/matlab/Contents.m.in diff --git a/src/matlab/SConscript b/src/matlab/SConscript index 2c0073049..172709d7e 100644 --- a/src/matlab/SConscript +++ b/src/matlab/SConscript @@ -90,10 +90,9 @@ localenv.AddPreAction(target, copy_var) localenv.Depends(target, env['install_python2_action']) install('$inst_matlab_dir', target) -contents = localenv.SubstFile('#interfaces/matlab/toolbox/Contents.m', - '#interfaces/matlab/toolbox/Contents.m.in') -localenv.AddPreAction(contents, copy_var) -localenv.Depends(contents, env['install_python2_action']) +# 'Contents.m' +contents = localenv.SubstFile('#interfaces/matlab/Contents.m', + '#interfaces/matlab/Contents.m.in') install('$inst_matlab_dir', contents) # 'cantera_demos.m'