--- projects/cms/source/conient/Makefile	2001/01/24 03:03:13	1.1
+++ projects/cms/source/conient/Makefile	2002/02/09 17:04:33	1.9
@@ -1,12 +1,12 @@
 # Makefile for conient
-# $Id: Makefile,v 1.1 2001/01/24 03:03:13 tdb Exp $
+# $Id: Makefile,v 1.9 2002/02/09 17:04:33 tdb Exp $
 
 include Config.inc
 
 all : build
 
 code : 
-	cd uk/ac/ukc/iscream && $(MAKE) all
+	cd uk/org/iscream/cms/conient && $(MAKE) all
 
 build : code
 	cd build && $(MAKE) package
@@ -16,10 +16,10 @@ run : build
 
 clean :
 	cd build && $(MAKE) clean
-	cd uk/ac/ukc/iscream && $(MAKE) clean
+	cd uk/org/iscream/cms/conient && $(MAKE) clean
 	rm -Rf $(BUILDCHECK)
 	rm -Rf $(CVSBUILDTEMP)
-	rm -Rf doc
+	rm -Rf $(DOCDIR)
 
 distclean : clean
 	cd $(BUILD) && rm -f $(CLPATH)
@@ -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)
@@ -53,6 +55,6 @@ cvsbuild :
 
 javadoc : 
 	if test ! -d "$(DOCDIR)"; then mkdir $(DOCDIR); fi
-	javadoc -d $(SOURCEROOT)/$(DOCDIR) -sourcepath $(SOURCEROOT) -classpath $(JCCLASSPATH) -author -version -private $(PKGLIST)
+	javadoc -d $(SOURCEROOT)/$(DOCDIR) -sourcepath $(SOURCEROOT)/$(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -link $(JDJAPI) -link $(JDSAPI) $(PKGLIST)
 
 include $(MKINC)