--- projects/cms/source/server/Makefile	2003/02/02 19:25:21	1.28
+++ projects/cms/source/server/Makefile	2003/02/16 20:35:59	1.35
@@ -1,5 +1,5 @@
 # Makefile for server
-# $Id: Makefile,v 1.28 2003/02/02 19:25:21 tdb Exp $
+# $Id: Makefile,v 1.35 2003/02/16 20:35:59 tdb Exp $
 
 include Config.inc
 
@@ -11,6 +11,7 @@ all : dist
 .PHONY : build
 build : $(IDLCHECK)
 	cd uk/org/iscream/cms/server && $(MAKE) all
+	cp $(SOURCEROOT)/$(LICFILE) $(BUILD)
 	cd $(BUILD) && $(MAKE) package
 
 ### Source, Doc, & Changelog
@@ -23,7 +24,8 @@ mksrc :
 	if test ! -d "$(SRCDIR)"; then mkdir -p $(SRCDIR); fi
 	echo "CVS" > TAR_EXCLUDE_TMP
 	echo ".#*" >> TAR_EXCLUDE_TMP
-	echo "build/lib/*.jar" >> TAR_EXCLUDE_TMP
+	echo "*.jar" >> TAR_EXCLUDE_TMP
+	echo ".done*" >> TAR_EXCLUDE_TMP
 	tar -cf - -X TAR_EXCLUDE_TMP $(SRCFILES) | ( cd $(SRCDIR) && tar -xf - )
 	rm -f TAR_EXCLUDE_TMP
 	@touch $(SRCCHECK)
@@ -37,7 +39,7 @@ mkjavadoc : $(IDLCHECK)
 	if test ! -d "$(DOCTMPDIR)"; then mkdir -p $(DOCTMPDIR); fi
 	cp -R $(SOURCEROOT)/uk $(DOCTMPDIR)
 	cp -R $(SOURCEROOT)/idl/uk $(DOCTMPDIR)
-	$(JAVADOCBIN) -d $(DOCDIR) -sourcepath $(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -linkoffline $(JDJAPI) $(JDJAPIC) -linkoffline $(JDPBAPI) $(JDPBAPIC) $(PKGLIST)
+	$(JAVADOCBIN) -d $(DOCDIR) -sourcepath $(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -linkoffline $(JDJAPI) $(JDJAPIC) -linkoffline $(JDPBAPI) $(JDPBAPIC) -linkoffline $(JDUAPI) $(JDUAPIC) $(PKGLIST)
 	rm -Rf $(DOCTMPDIR)
 	@touch $(JAVADOCCHECK)
 
@@ -78,13 +80,6 @@ distclean : clean
 	rm -Rf $(APICACHE)
 	rm -f Config.inc
 
-### Util Package
-
-.PHONY : buildutil
-buildutil : clean
-	cd uk/org/iscream/cms/server/util && $(MAKE) all
-	cd $(BUILD) && $(MAKE) packageutil
-
 ### Database
 
 .PHONY : createtable
@@ -98,23 +93,27 @@ droptable :
 ### Install
 
 .PHONY : install
-install : $(MCOMPILECHECK)
+install : $(MCOMPILECHECK) $(JAVADOCCHECK) $(CHANGELOG)
 	@echo "-------------------------------------------------------"
-	@echo "Installing to $(INSTALL)"
-	@echo "  copying $(PACKAGE) to $(INSTALL)"
-	mkdir -p $(INSTALL)
-	cp $(BUILD)/$(PACKAGE) $(INSTALL)
-	@echo "  copying libs to $(INSTALL)/lib"
-	mkdir -p $(INSTALL)/lib
-	cp $(LIBDIR)/*.jar $(INSTALL)/lib
-	@echo "  copying etc to $(INSTALL)/etc"
-	mkdir -p $(INSTALL)/etc
-	cp $(BUILD)/etc/default.properties $(INSTALL)/etc
-	cp $(BUILD)/etc/*.conf $(INSTALL)/etc
-	@echo "  copying scripts to $(INSTALL)"
-	cp $(BUILD)/run.sh $(INSTALL)
-	cp $(BUILD)/run.bat $(INSTALL)
-	@echo "Completed install to $(INSTALL)"
+	@echo "Installing to $(INSTALLPREFIX)"
+	@echo "  copying $(PACKAGE) to $(INSTALLPREFIX)"
+	@mkdir -p $(INSTALLPREFIX)
+	@cp $(BUILD)/$(PACKAGE) $(INSTALLPREFIX)
+	@echo "  copying libs to $(INSTALLPREFIX)/lib"
+	@mkdir -p $(INSTALLPREFIX)/lib
+	@cp $(LIBDIR)/*.jar $(INSTALLPREFIX)/lib
+	@echo "  copying etc to $(INSTALLPREFIX)/etc"
+	@mkdir -p $(INSTALLPREFIX)/etc
+	@cp $(BUILD)/etc/default.properties $(INSTALLPREFIX)/etc
+	@cp $(BUILD)/etc/*.conf $(INSTALLPREFIX)/etc
+	@echo "  copying scripts to $(INSTALLPREFIX)"
+	@cp $(BUILD)/run.sh $(INSTALLPREFIX)
+	@cp $(BUILD)/run.bat $(INSTALLPREFIX)
+	@echo "  copying documention to $(INSTALLPREFIX)/doc"
+	@cp -R $(BUILD)/doc $(INSTALLPREFIX)
+	@echo "  copying text information files to $(INSTALLPREFIX)"
+	@cp $(BUILD)/COPYING $(CHANGELOG) $(INSTALLPREFIX)
+	@echo "Completed install to $(INSTALLPREFIX)"
 	@echo "-------------------------------------------------------"
 
 ### Other