From 38a6a2bc0e41cfbfe0189038339078cd3d94f22c Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Mon, 15 Dec 2003 08:39:43 +0000
Subject: [PATCH] *** empty log message ***

---
 tools/src/Makefile.in          |  6 ++++--
 tools/src/finish_install.py.in | 11 ++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tools/src/Makefile.in b/tools/src/Makefile.in
index b54abec63..0560502eb 100755
--- a/tools/src/Makefile.in
+++ b/tools/src/Makefile.in
@@ -27,9 +27,11 @@ endif
 
 all: $(exes)
 
+ck: $(BINDIR)/ck2cti
+
 $(BINDIR)/ck2cti: ck2cti.o $(CONVLIB_DEP) $(CANTERALIB_DEP)
-	@CXX@ -o $(BINDIR)/ck2cti ck2cti.o $(LCXX_FLAGS) -lconverters $(LOCAL_LIBS) \
-               $(LCXX_END_LIBS)
+	@CXX@ -o $(BINDIR)/ck2cti ck2cti.o $(LCXX_FLAGS) \
+               -lconverters -lcantera -lctcxx $(LCXX_END_LIBS)
 
 $(BINDIR)/cti2ctml: cti2ctml.o $(CANTERALIB_DEP)
 	@CXX@ -o $(BINDIR)/cti2ctml cti2ctml.o $(LCXX_FLAGS) $(LOCAL_LIBS) \
diff --git a/tools/src/finish_install.py.in b/tools/src/finish_install.py.in
index 1f5729d93..4b7127e35 100644
--- a/tools/src/finish_install.py.in
+++ b/tools/src/finish_install.py.in
@@ -16,7 +16,7 @@ templdir = '@ct_templdir@'
 ctdir = '@ct_dir@'
 home = '@homedir@'
 
-f = open(home+'/setup_cantera','w')
+f = open(ctdir+'/setup_cantera','w')
 f.write('#!/bin/sh\n')
 f.write('LD_LIBRARY_PATH='+libdir+':$LD_LIBRARY_PATH\nexport LD_LIBRARY_PATH\n')
 f.write('PATH='+bindir+':$PATH\nexport PATH\n')
@@ -34,11 +34,12 @@ if localinst:
         try:
             import Cantera
             ctpath = Cantera.__path__[0]
-            if ctpath <> ctloc:
+            if ctpath <> ctloc+'/Cantera':
                 warn = """
  ######################################################################
     Warning: the Cantera Python package is already installed at
-    """+ctpath+""". The newly-installed package at
+    """+ctpath+""".
+    The newly-installed package at
     """+ctloc+"""/Cantera
     cannot be accessed until the existing one is removed.
  ######################################################################
@@ -121,12 +122,12 @@ else:
 
 print """
     
-    setup script      """+home+"""/setup_cantera
+    setup script      """+ctdir+"""/setup_cantera
     
     The setup script configures the environment for Cantera. It is
     recommended that you run this script by typing
 
-      source """+home+"""/setup_cantera
+      source """+ctdir+"""/setup_cantera
     
     before using Cantera, or else
     include its contents in your shell login script.