From 6ade908e92f201cb0472d383368ff1ced9a85c11 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Sun, 10 Oct 2004 12:12:21 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog             | 23 +++++++++++++++++++----
 Makefile.in           |  2 +-
 tools/src/Makefile.in |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60f0419af..3ccd408c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-10-10 05:11  dggoodwin
+
+	* Cantera/src/importCTML.cpp: moved arrays used to check for dup
+	  rxns into a class to avoid problems with initialization on some
+	  systems (FreeBSD)
+
+2004-10-10 05:09  dggoodwin
+
+	* Cantera/src/: global.h, misc.cpp: added sleep function
+
+2004-10-10 05:09  dggoodwin
+
+	* Cantera/src/ct2ctml.cpp: added sleep before call to python
+
 2004-10-09 11:58  dggoodwin
 
 	* ext/tpx/RedlichKwong.h: removed use of pow
@@ -4223,10 +4237,11 @@
 	  examples/cxx/transport_example2.cpp, ext/blas/Makefile.in,
 	  ext/cvode/Makefile.in, ext/f2c_libs/.cvsignore,
 	  ext/lapack/Makefile.in, ext/math/Makefile.in,
-	  ext/recipes/Makefile.in, ext/tpx/Makefile.in, ext/tpx/Sub.cpp,
-	  ext/tpx/Sub.h, ext/tpx/lk.cpp, ext/tpx/lk.h, ext/tpx/subs.h,
-	  ext/tpx/utils.cpp, include/GRI30.h, include/IdealGasMix.h,
-	  include/Interface.h, include/onedim.h, include/transport.h,
+	  ext/recipes/Makefile.in, ext/tpx/Makefile.in,
+	  ext/tpx/RedlichKwong.h, ext/tpx/Sub.cpp, ext/tpx/Sub.h,
+	  ext/tpx/lk.cpp, ext/tpx/lk.h, ext/tpx/subs.h, ext/tpx/utils.cpp,
+	  include/GRI30.h, include/IdealGasMix.h, include/Interface.h,
+	  include/onedim.h, include/transport.h,
 	  include/fortran/ctfdevmod.f, include/fortran/ctkineticsmod.f,
 	  include/fortran/ctmixturemod.f, include/fortran/ctmod.f,
 	  include/fortran/ctreactormod.f, include/fortran/ctthermomod.f,
diff --git a/Makefile.in b/Makefile.in
index 22a72aeb1..1b79a3949 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -262,7 +262,7 @@ uninstall:
 	rm -r -f @ct_docdir@
 	rm -r -f @ct_tutdir@
 	rm -r -f @prefix@/matlab/toolbox/cantera
-	cd tools; make uninstall
+	cd tools; @MAKE@ uninstall
 
 clean:
 	rm -f *.*~ @buildlib@/*.* 
diff --git a/tools/src/Makefile.in b/tools/src/Makefile.in
index 85cdf0718..73698f37e 100755
--- a/tools/src/Makefile.in
+++ b/tools/src/Makefile.in
@@ -40,7 +40,7 @@ $(BINDIR)/cti2ctml: cti2ctml.o $(CANTERALIB_DEP)
                $(LCXX_END_LIBS)
 
 $(CONVLIB_DEP):
-	cd ../../Cantera/src/converters; make
+	cd ../../Cantera/src/converters; @MAKE@
 
 clean:
 	$(RM) *.o *.*~