richard: server/kolabd/kolabd ChangeLog, 1.226, 1.227 Makefile.am, 1.50, 1.51

cvs at kolab.org cvs at kolab.org
Sun Feb 22 21:04:27 CET 2009


Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv28716

Modified Files:
	ChangeLog Makefile.am 
Log Message:
always distribute the template file template/rc.config.template.in,
see kolab/issue3408



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- ChangeLog	21 Feb 2009 22:21:37 -0000	1.226
+++ ChangeLog	22 Feb 2009 20:04:24 -0000	1.227
@@ -1,7 +1,10 @@
-2009-02-21 Richard Bos <richard at radoeka.nl>
+2009-02-22 Richard Bos <richard at radoeka.nl>
 
 	* Makefile.am: always distribute the template file
-	  template/rc.config.template.in, see kolab/issue3404
+	  template/rc.config.template.in, see kolab/issue3408
+
+2009-02-21 Richard Bos <richard at radoeka.nl>
+
 	* dist_conf/kolabsrv.in: added argument checks, source in the file
 	  /etc/kolab/profile.sh if it exists
 	* dist_conf/suse: assigned a value to kolab_quotawarning

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- Makefile.am	18 Feb 2009 15:49:05 -0000	1.50
+++ Makefile.am	22 Feb 2009 20:04:25 -0000	1.51
@@ -29,7 +29,8 @@
 dist_kolabconfig_DATA = $(kolabconfig_FILES)
 
 
-kolabtemplate_FILES = templates/access.template \
+kolabtemplatedir = $(kolabconfdir)/templates
+kolabtemplate_DATA = templates/access.template \
 	templates/amavisd.conf.template \
 	templates/canonical.template \
 	templates/clamd.conf.template \
@@ -62,15 +63,8 @@
 	templates/smtpd.conf.template \
 	templates/transport.template \
 	templates/virtual.template \
-	templates/local.cf.template
-
-kolabtemplatedir = $(kolabconfdir)/templates
-if OPENPKG
-kolabtemplate_DATA = $(kolabtemplate_FILES) \
+	templates/local.cf.template \
 	templates/rc.conf.template
-else
-kolabtemplate_DATA = $(kolabtemplate_FILES)
-endif
 
 
 kolabnamespace_FILES = namespace/libexec/newconfig \





More information about the commits mailing list