--- projects/cms/source/conient/Config2.inc	2001/01/28 23:44:04	1.3
+++ projects/cms/source/conient/Config2.inc	2001/03/15 01:05:46	1.9
@@ -1,5 +1,5 @@
 # Include Config for conient
-# $Id: Config2.inc,v 1.3 2001/01/28 23:44:04 tdb Exp $
+# $Id: Config2.inc,v 1.9 2001/03/15 01:05:46 ajm Exp $
 
 ##
 ## Only the first section needs changing here, the rest are just
@@ -14,8 +14,15 @@ CVSROOT = /usr/local/proj/co600_10/cvs
 CVSMODULE = source/client/conient
 # ****** 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
+ETCDIR = $(BUILD)/etc
+# Relative (to BUILD) location of the resources
+RESOURCESDIR = $(BUILD)/resources
 # Relative (to BUILD) location of the libraries
 LIBDIR = $(BUILD)/lib
 # Location of the main include
@@ -32,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
 
@@ -50,9 +60,9 @@ ZIPFILE = $(ARCNAME)$(ZIPEXT)
 # Name of JAR file (will be created in BUILD)
 PACKAGE = iscream-conient.jar
 # Main-class to be added to the Manifest
-MAINCLASS = uk.ac.ukc.iscream.conient.Conient
+MAINCLASS = uk.org.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)
@@ -62,7 +72,7 @@ COPYCHECK = .donecopy
 
 
 ## Javadoc package list
-PKGLIST = uk.ac.ukc.iscream.conient\
-          uk.ac.ukc.iscream.conient.datacomponents
+PKGLIST = uk.org.iscream.conient\
+          uk.org.iscream.conient.datacomponents
 
 DOCDIR = doc