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.33 by tdb, Wed Feb 5 16:43:44 2003 UTC vs.
Revision 1.39 by tdb, Tue Feb 11 22:38:29 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 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
#	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 82 | Line 80 | PKGLIST = uk.org.iscream.cms.server.clientinterface\
80		# Javadoc formatting
81		JDTITLE = "i-scream CMS server"
82		JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
83	<	JDBOTTOM = "<i>Copyright &\#169; 2000-2002 i-scream. All Rights Reserved.</i>"
83	>	JDBOTTOM = "<i>Copyright &\#169; 2000-2003 i-scream. All Rights Reserved.</i>"
84
85		# Javadoc Directories
86		DOCDIR = $(BUILD)/doc
#	Line 90 | Line 88 | DOCTMPDIR = $(BUILD)/.doctemp
88		APICACHE = $(SOURCEROOT)/.api-cache
89
90		# Javadoc API linking
91	<	JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
91	>	JDJAPI = "http://java.sun.com/j2se/1.4.1/docs/api/"
92		JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
93	+	JDUAPI = "http://www.i-scream.org.uk/javadoc/util/"
94
95		# Javadoc API cache
96		JDJAPIC = $(APICACHE)/jdk
97		JDPBAPIC = $(APICACHE)/pircbot
98	+	JDUAPIC = $(APICACHE)/util
99
100		# ChangeLog file
101		CHANGELOG = $(BUILD)/ChangeLog
#	Line 107 | Line 107 | SRCFILES = Config2.inc Makefile Makefile.inc README bu
107		build.xml configure db uk idl COPYING Version.inc \
108		$(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
109		$(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
110	<	$(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
110	>	$(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile \
111	>	$(BUILDDIRNAME)/COPYING
112
113		# User configurable options - defaults
114		dest = $(BUILD)
115	<	prefix = /usr/local/$(DISTNAME)
115	>	prefix = /opt/$(DISTNAME)-$(VERSION)
116
117		# Install Prefix
118	<	INSTALL = $(prefix)
118	>	INSTALLPREFIX = $(prefix)
119		DISTDEST = $(dest)
120
121		# Archive extensions

Diff Legend

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