--- projects/cms/source/server/Config2.inc	2000/12/13 20:35:08	1.3
+++ projects/cms/source/server/Config2.inc	2001/03/03 00:34:51	1.14
@@ -1,5 +1,5 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.3 2000/12/13 20:35:08 tdb Exp $
+# $Id: Config2.inc,v 1.14 2001/03/03 00:34:51 tdb Exp $
 
 ##
 ## Only the first section needs changing here, the rest are just
@@ -14,6 +14,9 @@ CVSROOT = /usr/local/proj/co600_10/cvs
 CVSSERVERMODULE = source/server
 # ****** 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 = $(SERVERROOT)/build
 # Relative (to BUILD) location of the libraries
@@ -32,13 +35,17 @@ rev = HEAD
 REVISION = $(rev)
 
 ## Compiler Information
-JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar
-JCCLASSPATH = $(JCLIBS):$(SERVERROOT):$(BUILD):.
+JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar:$(LIBDIR)/mm.mysql-2.0.2-bin.jar
+##### Added $(SERVERROOT)/idl - this may not be a good thing, but it helps dependencies.
+JCCLASSPATH = $(JCLIBS):$(SERVERROOT):$(BUILD):$(SERVERROOT)/idl:.
+# set JCFLAGS to these if you want to optimise and turn off debugging
+#JCFLAGS = -g:none -O
+JCFLAGS =
 
 ## Package information
 
 # Name of archives
-ARCNAME = iscream
+ARCNAME = iscream-server
 TAREXT = .tar
 TARGZEXT = .tar.gz
 ZIPEXT = .zip
@@ -48,14 +55,28 @@ TARGZFILE = $(ARCNAME)$(TARGZEXT)
 ZIPFILE = $(ARCNAME)$(ZIPEXT)
 
 # Name of JAR file (will be created in BUILD)
-PACKAGE = iscream.jar
+PACKAGE = iscream-server.jar
+UTILPACKAGE = iscream-util.jar
 # Main-class to be added to the Manifest
 MAINCLASS = uk.ac.ukc.iscream.componentmanager.ComponentManager
 # Class-path to be added to the Manifest
-CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/parser.jar
+CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/parser.jar lib/mm.mysql-2.0.2-bin.jar
 
 
 ## CHECK Files (for dependencies)
 IDLCHECK = $(SERVERROOT)/.doneidl
 BUILDCHECK = $(SERVERROOT)/.donebuild
 COMPILECHECK = .donecompile
+COPYCHECK = .donecopy
+
+## Javadoc package list
+PKGLIST = uk.ac.ukc.iscream.clientinterface uk.ac.ukc.iscream.componentmanager\
+	uk.ac.ukc.iscream.core uk.ac.ukc.iscream.core.loggers\
+	uk.ac.ukc.iscream.dbinterface uk.ac.ukc.iscream.filter\
+	uk.ac.ukc.iscream.filter.plugins uk.ac.ukc.iscream.filtermanager\
+	uk.ac.ukc.iscream.rootfilter uk.ac.ukc.iscream.util\
+	uk.ac.ukc.iscream.client uk.ac.ukc.iscream.client.monitors\
+	uk.ac.ukc.iscream.client.alerters
+
+DOCDIR = doc
+DOCTMPDIR = doctemp