--- projects/cms/source/conient/Makefile	2001/01/24 03:03:13	1.1
+++ projects/cms/source/conient/Makefile	2001/02/28 11:49:47	1.4
@@ -1,5 +1,5 @@
 # Makefile for conient
-# $Id: Makefile,v 1.1 2001/01/24 03:03:13 tdb Exp $
+# $Id: Makefile,v 1.4 2001/02/28 11:49:47 tdb Exp $
 
 include Config.inc
 
@@ -31,13 +31,15 @@ install : build
 	@echo "  copying $(PACKAGE) to $(INSTALL)"
 	mkdir -p $(INSTALL)
 	cp $(BUILD)/$(PACKAGE) $(INSTALL)
+	@echo "  copying configuration to $(INSTALL)/etc
+	mkdir -p $(INSTALL)/etc
+	cp $(ETCDIR)/*.conf $(INSTALL)/etc
+	@echo "  copying resources to $(INSTALL)/resources
+	mkdir -p $(INSTALL)/resources
+	cp $(RESOURCESDIR)/*.gif $(INSTALL/resources
 	@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)
@@ -45,7 +47,7 @@ install : build
 	@echo "-------------------------------------------------------"
 
 cvsbuild :
-	cvs -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSMODULE)
+	$(CVS) -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSMODULE)
 	cd $(CVSBUILDTEMP) && ./configure
 	cd $(CVSBUILDTEMP) && $(MAKE) build
 	cp $(CVSBUILDTEMP)/build/$(TARGZFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(TARGZEXT)