--- projects/cms/source/conient/Config2.inc	2001/02/28 11:49:47	1.5
+++ projects/cms/source/conient/Config2.inc	2001/03/14 21:56:00	1.8
@@ -1,5 +1,5 @@
 # Include Config for conient
-# $Id: Config2.inc,v 1.5 2001/02/28 11:49:47 tdb Exp $
+# $Id: Config2.inc,v 1.8 2001/03/14 21:56:00 tdb Exp $
 
 ##
 ## Only the first section needs changing here, the rest are just
@@ -12,9 +12,11 @@
 # Location of the CVS Repository Root
 CVSROOT = /usr/local/proj/co600_10/cvs
 CVSMODULE = source/client/conient
-CVS = /usr/local/bin/cvs
 # ****** These need to be set correctly ******
 
+# This will attempt to locate cvs, and return the path.
+CVS = `if test -x /usr/bin/cvs; then echo /usr/bin/cvs; else if test -x /usr/local/bin/cvs; then echo /usr/local/bin/cvs; else echo cvs; fi fi`
+
 # Location of the build directory
 BUILD = $(SOURCEROOT)/build
 # Relative (to BUILD) location of the configuration files
@@ -37,8 +39,11 @@ rev = HEAD
 REVISION = $(rev)
 
 ## Compiler Information
-JCLIBS = $(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar:$(LIBDIR)/iscream-util.jar
+JCLIBS = $(LIBDIR)/crimson.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/iscream-util.jar
 JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):.
+# set JCFLAGS to these if you want to optimise and turn off debugging
+#JCFLAGS = -g:none -O
+JCFLAGS =
 
 ## Package information
 
@@ -57,7 +62,7 @@ PACKAGE = iscream-conient.jar
 # Main-class to be added to the Manifest
 MAINCLASS = uk.ac.ukc.iscream.conient.Conient
 # Class-path to be added to the Manifest
-CLPATH = lib/jaxp.jar lib/parser.jar lib/iscream-util.jar
+CLPATH = lib/crimson.jar lib/jaxp.jar lib/iscream-util.jar
 
 
 ## CHECK Files (for dependencies)