--- projects/cms/source/server/Makefile	2001/03/14 23:25:17	1.21
+++ projects/cms/source/server/Makefile	2002/02/09 17:04:33	1.24
@@ -1,5 +1,5 @@
 # Makefile for server
-# $Id: Makefile,v 1.21 2001/03/14 23:25:17 tdb Exp $
+# $Id: Makefile,v 1.24 2002/02/09 17:04:33 tdb Exp $
 
 include Config.inc
 
@@ -12,7 +12,7 @@ buildidl : genidl
 	cd idl && $(MAKE) build
 
 code : genidl
-	cd uk/org/iscream && $(MAKE) all
+	cd uk/org/iscream/cms/server && $(MAKE) all
 
 build : buildidl code
 	cd build && $(MAKE) package
@@ -23,10 +23,10 @@ run : build
 clean :
 	cd idl && $(MAKE) clean
 	cd build && $(MAKE) clean
-	cd uk/org/iscream && $(MAKE) clean
+	cd uk/org/iscream/cms/server && $(MAKE) clean
 	rm -Rf $(BUILDCHECK) $(IDLCHECK)
 	rm -Rf $(CVSBUILDTEMP)
-	rm -Rf doc doctemp
+	rm -Rf $(DOCDIR) $(DOCTMPDIR)
 
 distclean : clean
 	cd $(BUILD) && rm -f $(CLPATH)
@@ -65,11 +65,11 @@ javadoc : genidl
 	if test ! -d "$(DOCTMPDIR)"; then mkdir $(DOCTMPDIR); fi
 	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)
+	javadoc -d $(SOURCEROOT)/$(DOCDIR) -sourcepath $(SOURCEROOT)/$(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -link $(JDJAPI) -link $(JDPBAPI) $(PKGLIST)
 	rm -Rf doctemp
 
 buildutil : clean
-	cd uk/org/iscream/util && $(MAKE) all
+	cd uk/org/iscream/cms/server/util && $(MAKE) all
 	cd build && $(MAKE) packageutil
 
 createtable :