--- projects/cms/source/server/Config2.inc	2003/01/26 14:02:52	1.29
+++ projects/cms/source/server/Config2.inc	2003/02/01 19:08:54	1.30
@@ -1,12 +1,13 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.29 2003/01/26 14:02:52 tdb Exp $
+# $Id: Config2.inc,v 1.30 2003/02/01 19:08:54 tdb Exp $
 
+include $(SOURCEROOT)/Version.inc
+
 # Name of our dist
 DISTNAME = iscream_server
 
 # Location of the i-scream CVS Repository Root
 CVSROOT = :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream
-CVSSERVERMODULE = cms/source/server
 
 # 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`
@@ -27,10 +28,10 @@ BUILD = $(SOURCEROOT)/$(BUILDDIRNAME)
 LIBDIR = $(BUILD)/lib
 # Location of the main include
 MKINC = $(SOURCEROOT)/Makefile.inc
+# IDL directory
+IDLDIR = $(SOURCEROOT)/idl
+IDLFILE = $(IDLDIR)/iscream.idl
 
-# cvs build temporary directory name
-CVSBUILDTEMP = .cvsbuildtemp
-
 # Compiler Information
 JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.11-bin.jar:$(LIBDIR)/pircbot.jar
 JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
@@ -47,10 +48,10 @@ MAINCLASS = uk.org.iscream.cms.server.componentmanager
 CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar
 
 # CHECK Files (for dependencies)
-IDLCHECK = $(SOURCEROOT)/.doneidl
-BUILDCHECK = $(SOURCEROOT)/.donebuild
-JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
+IDLCHECK = $(SOURCEROOT)/idl/.doneidl
+MCOMPILECHECK = $(SOURCEROOT)/$(COMPILECHECK)
 SRCCHECK = $(SOURCEROOT)/.donesrc
+JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
 MKDISTCHECK = $(BUILD)/.donemkdist
 MKDISTBINCHECK = $(BUILD)/.donemkdistbin
 MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles
@@ -101,18 +102,15 @@ SRCFILES = Config2.inc Makefile Makefile.inc README bu
            $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
            $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
            $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
+# **FIXME** putting libs in build/lib, but probably shouldn't...
 
 # User configurable options - defaults
-tag = HEAD
-ver = HEAD
 dest = $(BUILD)
 prefix = /usr/local/$(DISTNAME)
 
 # Install Prefix
 INSTALL = $(prefix)
-VERSION = $(ver)
 DISTDEST = $(dest)
-CVSTAG = $(tag)
 
 # Archive extensions
 TAREXT = .tar