kolabd/kolabd

[Git Service User]

 kolabd/kolabd/ChangeLog   |    9 +++++++--
 kolabd/kolabd/Makefile.am |    1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 518a2d8349a1a15e11fcc1daff7ecf55e5d9d645
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Nov 19 17:18:37 2011 +0100

    kolabd: Don't create $(webserver_document_root)$(webserver_web_prefix)/locks
    
    the new path is @@@resmgr_locksdir@@@.

diff --git a/kolabd/kolabd/ChangeLog b/kolabd/kolabd/ChangeLog
index 58f9370..6fea9cb 100644
--- a/kolabd/kolabd/ChangeLog
+++ b/kolabd/kolabd/ChangeLog
@@ -1,6 +1,11 @@
-2010-10-09  Mathieu Parent <math.parent at gmail.com>
+2011-11-19  Mathieu Parent <math.parent at gmail.com>
+
+	* Makefile.am,dist_conf/*: Remove references to kolab_logdir, not used.
+
+	* Makefile.am: Don't create
+	$(webserver_document_root)$(webserver_web_prefix)/locks, the new path
+	is @@@resmgr_locksdir@@@.
 
-	* Makefile,dist_conf/*: Remove references to kolab_logdir, not used.
 
 2010-10-19  Gunnar Wrobel  <p at rdus.de>
 
diff --git a/kolabd/kolabd/Makefile.am b/kolabd/kolabd/Makefile.am
index bcf0b60..f545d03 100644
--- a/kolabd/kolabd/Makefile.am
+++ b/kolabd/kolabd/Makefile.am
@@ -190,7 +190,6 @@ install-data-hook:
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_logdir)/php
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
 	chmod 644 $(DESTDIR)$(kolabconfdir)/kolab.globals
 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
 	chmod 755 $(DESTDIR)$(kolabnamespacedir)/*