From 23e792f1a142327cf4a289f837dd817e7fe1962d Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Wed, 7 Nov 2012 23:30:25 +0000 Subject: [PATCH] Added a CANTERA_INSTALL_ROOT Makefile variable. --- platform/posix/Cantera.mak.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/posix/Cantera.mak.in b/platform/posix/Cantera.mak.in index 89c0fe330..0eb561806 100644 --- a/platform/posix/Cantera.mak.in +++ b/platform/posix/Cantera.mak.in @@ -25,20 +25,22 @@ CANTERA_VERSION=@cantera_version@ # #include "cantera/thermo.h" # #include "cantera/kernel/HMWSoln.h" -CANTERA_CORE_INCLUDES=-I@ct_incroot@ +CANTERA_INSTALL_ROOT=@ct_installroot@ + +CANTERA_CORE_INCLUDES=-I$(CANTERA_INSTALL_ROOT)/include CANTERA_EXTRA_INCLUDES=@mak_extra_includes@ # Required Cantera libraries -CANTERA_CORE_LIBS=@mak_threadflags@ -L@ct_libdir@ @mak_corelibs@ +CANTERA_CORE_LIBS=@mak_threadflags@ -L$(CANTERA_INSTALL_ROOT)/lib @mak_corelibs@ -CANTERA_CORE_LIBS_DEP = @ct_libdir@/libcantera.a +CANTERA_CORE_LIBS_DEP = $(CANTERA_INSTALL_ROOT)/lib/libcantera.a CANTERA_EXTRA_LIBDIRS=@mak_extra_libdirs@ CANTERA_CORE_FTN=-L@ct_libdir@ -lcantera_fortran @mak_corelibs@ -CANTERA_FORTRAN_MODS=@ct_incroot@/cantera +CANTERA_FORTRAN_MODS=$(CANTERA_INSTALL_ROOT)/include/cantera CANTERA_FORTRAN_SYSLIBS=@mak_fort_threadflags@ -lstdc++