gunnar: server/kolab-webadmin/kolab-webadmin Makefile.am,1.60,1.61

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile.am 
Log Message:
Move the sieve utilities into the default PHP library location. There is no need to keep the code separate.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Makefile.am	22 Feb 2010 06:38:02 -0000	1.60
+++ Makefile.am	31 Mar 2010 19:55:10 -0000	1.61
@@ -108,7 +108,6 @@
 PHP_INCLUDES = php/admin/include/menu.php \
 	php/admin/include/debug.php \
 	php/admin/include/form.class.php \
-	php/admin/include/sieveutils.class.php \
 	php/admin/include/authenticate.php \
 	php/admin/include/locale.php \
 	php/admin/include/Sieve.php \
@@ -123,8 +122,12 @@
 EXTRA_DIST += $(PHP_INCLUDES)
 
 PEARKA_FILES = lib/KolabAdmin/Ldap.php
-pearkadir = $(phpincludesdir)/KolabAdmin
+pearkadir = $(phplibdir)/KolabAdmin
 dist_pearka_DATA = $(PEARKA_FILES)
+
+PEARKA_SIEVE_FILES = lib/KolabAdmin/Sieve/Script.php
+pearkasievedir = $(phplibdir)/KolabAdmin/Sieve
+dist_pearkasieve_DATA = $(PEARKA_SIEVE_FILES)
 
 PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
 	php/admin/templates/kde.tpl \