From c7ff7dd1cfb8624afdd7024c7c52dd70e52be4ff Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 4 Mar 2013 17:31:11 +0000 Subject: [PATCH] [SCons] Fixed path to Cantera.mak in sample Makefiles Fixes Issue 144. --- samples/cxx/Makefile.in | 2 +- samples/cxx/SConscript | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/cxx/Makefile.in b/samples/cxx/Makefile.in index 3de181c1d..75f6255ed 100644 --- a/samples/cxx/Makefile.in +++ b/samples/cxx/Makefile.in @@ -1,4 +1,4 @@ -include ../../Cantera.mak +include @make_Cantera_dot_mak@ CC=@CC@ CXX=@CXX@ diff --git a/samples/cxx/SConscript b/samples/cxx/SConscript index 030177420..8761a15b7 100644 --- a/samples/cxx/SConscript +++ b/samples/cxx/SConscript @@ -30,6 +30,7 @@ for subdir, name, extensions in samples: ## Generate Makefiles to be installed localenv['make_sourcefile'] = '%s.cpp' % name localenv['make_target'] = name + localenv['make_Cantera_dot_mak'] = pjoin(localenv['ct_incroot'], 'cantera', 'Cantera.mak') makefile = build(localenv.SubstFile(pjoin(subdir, 'Makefile'), 'Makefile.in')) install(pjoin('$inst_sampledir', 'cxx', subdir), makefile)