--- projects/cms/source/server/Makefile	2001/01/16 01:35:35	1.13
+++ projects/cms/source/server/Makefile	2001/03/14 22:01:08	1.19
@@ -1,5 +1,5 @@
 # Makefile for server
-# $Id: Makefile,v 1.13 2001/01/16 01:35:35 tdb Exp $
+# $Id: Makefile,v 1.19 2001/03/14 22:01:08 tdb Exp $
 
 include Config.inc
 
@@ -45,25 +45,30 @@ install : build
 	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 "-------------------------------------------------------"
 
 cvsbuild :
-	cvs -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
+	$(CVS) -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
 	cd $(CVSBUILDTEMP) && ./configure
+	cd $(CVSBUILDTEMP) && $(MAKE) buildutil
 	cd $(CVSBUILDTEMP) && $(MAKE) build
 	cp $(CVSBUILDTEMP)/build/$(TARGZFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(TARGZEXT)
 	cp $(CVSBUILDTEMP)/build/$(ZIPFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(ZIPEXT)
+	cp $(CVSBUILDTEMP)/build/$(UTILPACKAGE) $(BUILD)
 
 javadoc : genidl
 	if test ! -d "$(DOCDIR)"; then mkdir $(DOCDIR); fi
 	if test ! -d "$(DOCTMPDIR)"; then mkdir $(DOCTMPDIR); fi
-	cp -R $(SERVERROOT)/uk $(SERVERROOT)/$(DOCTMPDIR)
-	cp -R $(SERVERROOT)/idl/uk $(SERVERROOT)/$(DOCTMPDIR)
-	javadoc -d $(SERVERROOT)/$(DOCDIR) -sourcepath $(SERVERROOT)/$(DOCTMPDIR) -classpath $(JCCLASSPATH) -author -version -private $(PKGLIST)
+	cp -R $(SOURCEROOT)/uk $(SOURCEROOT)/$(DOCTMPDIR)
+	cp -R $(SOURCEROOT)/idl/uk $(SOURCEROOT)/$(DOCTMPDIR)
+	javadoc -d $(SOURCEROOT)/$(DOCDIR) -sourcepath $(SOURCEROOT)/$(DOCTMPDIR) -classpath $(JCCLASSPATH) -author -version -private $(PKGLIST)
 	rm -Rf doctemp
 
-buildutil : genidl
+buildutil : clean
 	cd uk/ac/ukc/iscream/util && $(MAKE) all
 	cd build && $(MAKE) packageutil