richard: server/kolab-resource-handlers/kolab-resource-handlers ChangeLog, 1.12, 1.13 Makefile.am, 1.6, 1.7

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv20581

Modified Files:
	ChangeLog Makefile.am 
Log Message:
the build proces did not use the resmgr_scriptsdir variable,
this is now corrected



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	5 Feb 2006 20:10:08 -0000	1.12
+++ ChangeLog	26 Mar 2006 13:28:08 -0000	1.13
@@ -1,3 +1,7 @@
+2006-03-26 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: the build proces did not use the resmgr_scriptsdir
+	  variable, this is now corrected
+
 2006-02-05 Richard Bos <richard at radoeka.nl>
 	* freebusy/freebusycache.class.php, freebusy/freebusy.class.php,
 	  resmgr/resmgr.php, resmgr/olhacks.php: removed

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	5 Feb 2006 20:15:10 -0000	1.6
+++ Makefile.am	26 Mar 2006 13:28:08 -0000	1.7
@@ -28,15 +28,19 @@
 
 
 conffile_FILES = $(srcdir)/freebusy/freebusy.conf \
-	resmgr/resmgr.conf \
-	resmgr/kolabfilter.php \
-	resmgr/kolabmailboxfilter.php
+	resmgr/resmgr.conf
 
 conffiledir = $(resmgr_confdir)
 conffile_DATA = $(conffile_FILES)
 EXTRA_DIST += freebusy/freebusy.conf
 
 
+resmgrscript_SCRIPTS = resmgr/kolabfilter.php \
+	resmgr/kolabmailboxfilter.php
+
+resmgrscriptdir = $(resmgr_scriptsdir)
+
+
 resmgr_FILES = resmgr/kolabmailtransport.php \
 	resmgr/misc.php
 
@@ -119,8 +123,8 @@
 install-data-hook:
 	install -d -m 755 $(DESTDIR)/$(resmgr_filterdir)
 	install -d -m 755 $(DESTDIR)/$(freebusy_cachedir)
-	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabfilter.php
-	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabmailboxfilter.php
+	chmod a+x $(DESTDIR)/$(resmgr_scriptsdir)/kolabfilter.php
+	chmod a+x $(DESTDIR)/$(resmgr_scriptsdir)/kolabmailboxfilter.php
 	chmod a+x $(DESTDIR)/$(phplibdir2)/$(kolab_php_module_prefix)kolabfilter/resmgr.php
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/freebusy.conf
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/resmgr.conf