--- projects/cms/source/server/build/Makefile	2003/02/02 19:25:21	1.13
+++ projects/cms/source/server/build/Makefile	2003/02/21 13:45:48	1.17
@@ -1,5 +1,5 @@
 # Makefile for build
-# $Id: Makefile,v 1.13 2003/02/02 19:25:21 tdb Exp $
+# $Id: Makefile,v 1.17 2003/02/21 13:45:48 tdb Exp $
 
 include ../Config.inc
 
@@ -12,8 +12,8 @@ all : dist
 clean :
 	rm -Rf $(BUILDFILES)
 	rm -f $(PACKAGE)
-	rm -f $(UTILPACKAGE)
 	rm -f $(CHANGELOG)
+	rm -f $(LICFILE)
 	rm -Rf $(DISTDIR)
 	rm -f $(TARFILE) $(TARGZFILE) $(ZIPFILE)
 	rm -f $(TARGZFILESIG) $(ZIPFILESIG)
@@ -29,15 +29,9 @@ $(PACKAGE) : $(IDLCHECK) $(MCOMPILECHECK)
 	rm -f $(PACKAGE)
 	@echo "Main-Class: $(MAINCLASS)" > MANIFEST_TMP
 	@echo "Class-Path: $(CLPATH)" >> MANIFEST_TMP
-	jar -cmf MANIFEST_TMP $(PACKAGE) $(BUILDFILES)
+	jar -cmf MANIFEST_TMP $(PACKAGE) $(BUILDFILES) $(JACPROP)
 	rm -f MANIFEST_TMP
 
-.PHONY : packageutil
-packageutil : $(UTILPACKAGE)
-
-$(UTILPACKAGE) : $(MCOMPILECHECK)
-	jar -cf $(UTILPACKAGE) $(BUILDFILES)
-
 .PHONY : dist-bin
 dist-bin : $(MKDISTBINCHECK) $(MKDISTFILESBINCHECK)
 
@@ -50,7 +44,7 @@ $(MKDISTBINCHECK) : $(PACKAGE) $(CHANGELOG)
 	if test ! -d "$(DISTDIR)"; then mkdir -p $(DISTDIR); fi
 	echo "CVS" > TAR_EXCLUDE_TMP
 	echo ".#*" >> TAR_EXCLUDE_TMP
-	tar -cf - -X TAR_EXCLUDE_TMP $(PACKAGE) lib etc README run.sh run.bat COPYING | ( cd $(DISTDIR) && tar -xf - )
+	tar -cf - -X TAR_EXCLUDE_TMP $(PACKAGE) lib etc ChangeLog README run.sh run.bat COPYING | ( cd $(DISTDIR) && tar -xf - )
 	rm -f TAR_EXCLUDE_TMP
 	@touch $(MKDISTBINCHECK)
 	@rm -f $(MKDISTFILESCHECK)