From ccf636d36772af60a4a1f899573637118da90315 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Sat, 20 Dec 2003 11:25:26 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/matlab/setup_matlab.py | 8 ++++---- Cantera/src/config.h | 6 +++--- config.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cantera/matlab/setup_matlab.py b/Cantera/matlab/setup_matlab.py index ba9116c3d..5901c5783 100644 --- a/Cantera/matlab/setup_matlab.py +++ b/Cantera/matlab/setup_matlab.py @@ -1,10 +1,10 @@ import sys -bindir = '/usr/local/bin' -libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.0.0' -incdir = '/Users/dgg/dv/sf/cantera/build/include' -libs = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -lg2c -lgcc' +bindir = '/home/goodwin/bin' +libdir = '/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu' +incdir = '/home/goodwin/dv/sf/cantera/build/include' +libs = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -L/usr/lib/gcc-lib/i386-redhat-linux/2.96 -L/usr/lib/gcc-lib/i386-redhat-linux/2.96/../../.. -lg2c -lm' f = open('setup.m','w') f.write('cd cantera\nbuildux\nexit\n') diff --git a/Cantera/src/config.h b/Cantera/src/config.h index 656ac8921..b6caa522c 100755 --- a/Cantera/src/config.h +++ b/Cantera/src/config.h @@ -50,7 +50,7 @@ typedef int ftnlen; // Fortran hidden string length type // The configure script defines this if the operatiing system is Mac // OS X, This used to add some Mac-specific directories to the default // data file search path. -#define DARWIN 1 +#define DARWIN 0 //--------- Fonts for reaction path diagrams ---------------------- @@ -60,13 +60,13 @@ typedef int ftnlen; // Fortran hidden string length type //--------------------- Python ------------------------------------ // used to run Python to process .cti files -#define PYTHON_EXE "/usr/bin/python" +#define PYTHON_EXE "/home/goodwin/bin/python" //--------------------- Cantera ----------------------------------- // used to find data files -#define CANTERA_ROOT "/usr/local/cantera" +#define CANTERA_ROOT "/home/goodwin/cantera" diff --git a/config.h b/config.h index 656ac8921..b6caa522c 100755 --- a/config.h +++ b/config.h @@ -50,7 +50,7 @@ typedef int ftnlen; // Fortran hidden string length type // The configure script defines this if the operatiing system is Mac // OS X, This used to add some Mac-specific directories to the default // data file search path. -#define DARWIN 1 +#define DARWIN 0 //--------- Fonts for reaction path diagrams ---------------------- @@ -60,13 +60,13 @@ typedef int ftnlen; // Fortran hidden string length type //--------------------- Python ------------------------------------ // used to run Python to process .cti files -#define PYTHON_EXE "/usr/bin/python" +#define PYTHON_EXE "/home/goodwin/bin/python" //--------------------- Cantera ----------------------------------- // used to find data files -#define CANTERA_ROOT "/usr/local/cantera" +#define CANTERA_ROOT "/home/goodwin/cantera"