--- projects/cms/source/server/build/Makefile	2000/12/12 21:11:27	1.1.2.6
+++ projects/cms/source/server/build/Makefile	2001/01/18 23:41:28	1.5
@@ -1,5 +1,5 @@
 # Makefile for build
-# $Id: Makefile,v 1.1.2.6 2000/12/12 21:11:27 tdb Exp $
+# $Id: Makefile,v 1.5 2001/01/18 23:41:28 tdb Exp $
 
 include ../Config.inc
 
@@ -10,19 +10,29 @@ all : package
 clean :
 	rm -Rf $(BUILDFILES)
 	rm -Rf $(PACKAGE)
-	rm -Rf $(TARFILE)
-	rm -Rf $(TARGZFILE)
-	rm -Rf $(ZIPFILE)
+	rm -Rf $(UTILPACKAGE)
+	rm -Rf $(ARCNAME)*$(TAREXT)
+	rm -Rf $(ARCNAME)*$(TARGZEXT)
+	rm -Rf $(ARCNAME)*$(ZIPEXT)
 
-package : $(PACKAGE)
+package : $(PACKAGE) maketar makezip
 
 $(PACKAGE) : $(BUILDCHECK)
 	@echo "Main-Class: $(MAINCLASS)" > MANIFEST_TMP
 	@echo "Class-Path: $(CLPATH)" >> MANIFEST_TMP
 	jar -cmf MANIFEST_TMP $(PACKAGE) $(BUILDFILES)
 	rm -f MANIFEST_TMP
-	tar -cvf $(TARFILE) $(PACKAGE) lib etc README
-	gzip -v9 $(TARFILE)
-	zip -R -9 $(ZIPFILE) $(PACKAGE) lib/* etc/* README
+
+packageutil : $(UTILPACKAGE)
+
+$(UTILPACKAGE) : $(BUILDCHECK)
+	jar -cf $(UTILPACKAGE) $(BUILDFILES)
+
+maketar :
+	tar -cvf $(TARFILE) $(PACKAGE) `ls -d lib/* | grep -v CVS` `ls -d etc/* | grep -v CVS` README run.sh
+	gzip -fv9 $(TARFILE)
+
+makezip :
+	zip -R -9 $(ZIPFILE) $(PACKAGE) `ls -d lib/* | grep -v CVS` `ls -d etc/* | grep -v CVS` README run.bat
 
 include $(MKINC)