ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/Config2.inc

Comparing projects/cms/source/server/Config2.inc (file contents):
Revision 1.32 by tdb, Tue Feb 4 22:41:47 2003 UTC vs.
Revision 1.36 by tdb, Wed Feb 5 22:27:24 2003 UTC

#	Line 15 | Line 15 | CVS = `if test -x /usr/bin/cvs; then echo /usr/bin/cvs
15		# and the same for cvs2cl
16		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`
17		# and flags for cvs2cl
18	<	CVS2CLFLAGS = --stdout -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
18	>	CVS2CLFLAGS = --stdout --no-wrap -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
19
20		# and the same for gpg
21		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`
#	Line 38 | Line 38 | IDLDIR = $(SOURCEROOT)/idl
38		IDLFILE = $(IDLDIR)/iscream.idl
39
40		# Compiler Information
41	<	JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.11-bin.jar:$(LIBDIR)/pircbot.jar
41	>	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
42		JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
43		# set JCFLAGS to these if you want to optimise and turn off debugging
44		#JCFLAGS = -g:none -O
#	Line 46 | Line 46 | JCFLAGS =
46
47		# Name of JAR file (will be created in BUILD)
48		PACKAGE = $(DISTNAME).jar
49	–	UTILPACKAGE = iscream_util.jar
49		# Main-class to be added to the Manifest
50		MAINCLASS = uk.org.iscream.cms.server.componentmanager.ComponentManager
51		# Class-path to be added to the Manifest
52	<	CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar
52	>	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
53
54		# CHECK Files (for dependencies)
55		IDLCHECK = $(SOURCEROOT)/idl/.doneidl
#	Line 74 | Line 73 | PKGLIST = uk.org.iscream.cms.server.clientinterface\
73		uk.org.iscream.cms.server.filter.plugins\
74		uk.org.iscream.cms.server.filtermanager\
75		uk.org.iscream.cms.server.rootfilter\
77	–	uk.org.iscream.cms.server.util\
76		uk.org.iscream.cms.server.client\
77		uk.org.iscream.cms.server.client.monitors\
78		uk.org.iscream.cms.server.client.alerters
#	Line 111 | Line 109 | SRCFILES = Config2.inc Makefile Makefile.inc README bu
109
110		# User configurable options - defaults
111		dest = $(BUILD)
112	<	prefix = /usr/local/$(DISTNAME)
112	>	prefix = /opt/$(DISTNAME)-$(VERSION)
113
114		# Install Prefix
115	<	INSTALL = $(prefix)
115	>	INSTALLPREFIX = $(prefix)
116		DISTDEST = $(dest)
117
118		# Archive extensions

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines