steffen: server/kolab-webadmin/kolab-webadmin Makefile.am, 1.20, 1.21 bootstrap, 1.1, 1.2

cvs at intevation.de cvs at intevation.de
Tue Jul 5 12:31:53 CEST 2005


Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv9721/kolab-webadmin

Modified Files:
	Makefile.am bootstrap 
Log Message:
multi-domain config (working) + per-domain maintainer config (not working yet)

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	17 Jun 2005 15:19:16 -0000	1.20
+++ Makefile.am	5 Jul 2005 10:31:51 -0000	1.21
@@ -57,6 +57,12 @@
 wsmaintainerdir = $(wsadmindir)/maintainer
 wsmaintainer_DATA = $(WSMAINTAINER_FILES)
 
+WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
+	www/admin/domainmaintainer/index.php
+
+wsdomainmaintainerdir = $(wsadmindir)/domainmaintainer
+wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
+
 WSPICS_FILES = www/admin/pics/erfrakon.png \
 	www/admin/pics/codefusion.png \
 	www/admin/pics/intevation_logo.png \
@@ -124,6 +130,7 @@
 	php/admin/templates/adminlistall.tpl \
 	php/admin/templates/login.tpl \
 	php/admin/templates/maintainerlistall.tpl \
+	php/admin/templates/domainmaintainerlistall.tpl \
 	php/admin/templates/kolab.tpl \
 	php/admin/templates/versions.tpl \
 	php/admin/templates/addrlistall.tpl \
@@ -181,6 +188,7 @@
 	$(WSDISTRIBUTIONLIST_FILES) \
 	$(WSKOLAB_FILES) \
 	$(WSMAINTAINER_FILES) \
+	$(WSDOMAINMAINTAINER_FILES) \
 	$(WSPICS_FILES) \
 	$(WSSERVICE_FILES) \
 	$(WSsharedfolder_FILES) \

Index: bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/bootstrap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bootstrap	7 Jun 2004 22:29:45 -0000	1.1
+++ bootstrap	5 Jul 2005 10:31:51 -0000	1.2
@@ -1,4 +1,4 @@
-cp -pr ../../dist_conf .
+cp -pr ../../perl-kolab/dist_conf .
 
 touch NEWS README AUTHORS ChangeLog
 





More information about the commits mailing list