--- projects/cms/source/server/Config2.inc	2001/03/03 00:34:51	1.14
+++ projects/cms/source/server/Config2.inc	2001/03/14 22:01:08	1.17
@@ -1,5 +1,5 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.14 2001/03/03 00:34:51 tdb Exp $
+# $Id: Config2.inc,v 1.17 2001/03/14 22:01:08 tdb Exp $
 
 ##
 ## Only the first section needs changing here, the rest are just
@@ -18,26 +18,26 @@ CVSSERVERMODULE = source/server
 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
+BUILD = $(SOURCEROOT)/build
 # Relative (to BUILD) location of the libraries
 LIBDIR = $(BUILD)/lib
 # Location of the main include
-MKINC = $(SERVERROOT)/Makefile.inc
+MKINC = $(SOURCEROOT)/Makefile.inc
 
 # Install Prefix
 prefix = /usr/local/iscream-server
 INSTALL = $(prefix)
 
 # cvsbuild temporary directory name
-CVSBUILDTEMP = $(SERVERROOT)/cvsbuildtemp
+CVSBUILDTEMP = $(SOURCEROOT)/cvsbuildtemp
 # cvsbuild default revision
 rev = HEAD
 REVISION = $(rev)
 
 ## Compiler Information
-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:.
+JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.2-bin.jar
+##### Added $(SOURCEROOT)/idl - this may not be a good thing, but it helps dependencies.
+JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
 # set JCFLAGS to these if you want to optimise and turn off debugging
 #JCFLAGS = -g:none -O
 JCFLAGS =
@@ -60,12 +60,12 @@ 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 lib/mm.mysql-2.0.2-bin.jar
+CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.2-bin.jar lib/crimson.jar
 
 
 ## CHECK Files (for dependencies)
-IDLCHECK = $(SERVERROOT)/.doneidl
-BUILDCHECK = $(SERVERROOT)/.donebuild
+IDLCHECK = $(SOURCEROOT)/.doneidl
+BUILDCHECK = $(SOURCEROOT)/.donebuild
 COMPILECHECK = .donecompile
 COPYCHECK = .donecopy