--- projects/cms/source/server/Config2.inc	2003/02/04 22:41:47	1.32
+++ projects/cms/source/server/Config2.inc	2004/08/01 10:40:36	1.44
@@ -1,5 +1,5 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.32 2003/02/04 22:41:47 tdb Exp $
+# $Id: Config2.inc,v 1.44 2004/08/01 10:40:36 tdb Exp $
 
 include $(SOURCEROOT)/Version.inc
 
@@ -7,7 +7,7 @@ include $(SOURCEROOT)/Version.inc
 DISTNAME = iscream_server
 
 # Location of the i-scream CVS Repository Root
-CVSROOT = :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream
+CVSROOT = :pserver:anonymous@cvs.i-scream.org:/cvs/i-scream
 
 # 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`
@@ -15,7 +15,7 @@ CVS = `if test -x /usr/bin/cvs; then echo /usr/bin/cvs
 # and the same for cvs2cl
 CVS2CL = `if test -x /usr/bin/cvs2cl; then echo /usr/bin/cvs2cl; else if test -x /usr/local/bin/cvs2cl; then echo /usr/local/bin/cvs2cl; else echo cvs2cl; fi fi`
 # and flags for cvs2cl
-CVS2CLFLAGS = --stdout -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
+CVS2CLFLAGS = --stdout --no-wrap -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
 
 # and the same for gpg
 GPG = `if test -x /usr/bin/gpg; then echo /usr/bin/gpg; else if test -x /usr/local/bin/gpg; then echo /usr/local/bin/gpg; else echo gpg; fi fi`
@@ -38,7 +38,7 @@ IDLDIR = $(SOURCEROOT)/idl
 IDLFILE = $(IDLDIR)/iscream.idl
 
 # 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
+JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.11-bin.jar:$(LIBDIR)/pircbot.jar:$(LIBDIR)/iscream_util.jar
 JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
 # set JCFLAGS to these if you want to optimise and turn off debugging
 #JCFLAGS = -g:none -O
@@ -46,11 +46,10 @@ JCFLAGS =
 
 # Name of JAR file (will be created in BUILD)
 PACKAGE = $(DISTNAME).jar
-UTILPACKAGE = iscream_util.jar
 # Main-class to be added to the Manifest
 MAINCLASS = uk.org.iscream.cms.server.componentmanager.ComponentManager
 # Class-path to be added to the Manifest
-CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar
+CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar lib/iscream_util.jar
 
 # CHECK Files (for dependencies)
 IDLCHECK = $(SOURCEROOT)/idl/.doneidl
@@ -69,20 +68,18 @@ PKGLIST = uk.org.iscream.cms.server.clientinterface\
 	uk.org.iscream.cms.server.componentmanager\
 	uk.org.iscream.cms.server.core\
 	uk.org.iscream.cms.server.core.loggers\
-	uk.org.iscream.cms.server.dbinterface\
 	uk.org.iscream.cms.server.filter\
 	uk.org.iscream.cms.server.filter.plugins\
 	uk.org.iscream.cms.server.filtermanager\
 	uk.org.iscream.cms.server.rootfilter\
-	uk.org.iscream.cms.server.util\
 	uk.org.iscream.cms.server.client\
 	uk.org.iscream.cms.server.client.monitors\
 	uk.org.iscream.cms.server.client.alerters
 
 # Javadoc formatting
 JDTITLE = "i-scream CMS server"
-JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
-JDBOTTOM = "<i>Copyright &\#169; 2000-2002 i-scream. All Rights Reserved.</i>"
+JDHEADER = "<img src='http://www.i-scream.org/i-scream_small.gif' width='146' height='38'>"
+JDBOTTOM = "<i>Copyright &\#169; 2000-2003 i-scream. All Rights Reserved.</i>"
 
 # Javadoc Directories
 DOCDIR = $(BUILD)/doc
@@ -90,12 +87,14 @@ DOCTMPDIR = $(BUILD)/.doctemp
 APICACHE = $(SOURCEROOT)/.api-cache
 
 # Javadoc API linking
-JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
+JDJAPI = "http://java.sun.com/j2se/1.4.2/docs/api/"
 JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
+JDUAPI = "http://www.i-scream.org/javadoc/util/"
 
 # Javadoc API cache
 JDJAPIC = $(APICACHE)/jdk
 JDPBAPIC = $(APICACHE)/pircbot
+JDUAPIC = $(APICACHE)/util
 
 # ChangeLog file
 CHANGELOG = $(BUILD)/ChangeLog
@@ -107,14 +106,21 @@ SRCFILES = Config2.inc Makefile Makefile.inc README bu
            build.xml configure db uk idl COPYING Version.inc \
            $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
            $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
-           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
+           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile \
+           $(BUILDDIRNAME)/$(JACPROP)
 
+# License file
+LICFILE = COPYING
+
+# Jacorb properties file
+JACPROP = jacorb.properties
+
 # User configurable options - defaults
 dest = $(BUILD)
-prefix = /usr/local/$(DISTNAME)
+prefix = /opt/$(DISTNAME)-$(VERSION)
 
 # Install Prefix
-INSTALL = $(prefix)
+INSTALLPREFIX = $(prefix)
 DISTDEST = $(dest)
 
 # Archive extensions