richard: server/kolabd/kolabd ChangeLog, 1.40, 1.41 Makefile.am, 1.15, 1.16

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Makefile.am: install templates/rc.conf.template only on openpkg installations



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangeLog	9 Jan 2006 21:44:31 -0000	1.40
+++ ChangeLog	9 Jan 2006 22:09:08 -0000	1.41
@@ -1,4 +1,6 @@
 2006-01-09 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: install templates/rc.conf.template only on openpkg
+	  installations.
 	* dist_conf/suse: changed owners and groups according the owners
 	  and groups as defined by suse.
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	6 Jan 2006 12:24:36 -0000	1.15
+++ Makefile.am	9 Jan 2006 22:09:08 -0000	1.16
@@ -59,7 +59,6 @@
 	templates/kolab_smtpdpolicy.conf.template \
 	templates/php.ini.template \
 	templates/proftpd.conf.template \
-	templates/rc.conf.template \
 	templates/resmgr.conf.template \
 	templates/saslauthd.conf.template \
 	templates/session_vars.php.template \
@@ -71,7 +70,12 @@
 	templates/virtual.template
 
 kolabtemplatedir = $(kolabconfdir)/templates
+if OPENPKG
+kolabtemplate_DATA = $(kolabtemplate_FILES) \
+	templates/rc.conf.template
+else
 kolabtemplate_DATA = $(kolabtemplate_FILES)
+endif
 
 
 kolabnamespace_FILES = namespace/libexec/newconfig \