marcus: server/kolabd/kolabd/dist_conf common, 1.34, 1.35 gentoo, 1.8, 1.9 kolab, 1.41, 1.42 suse, 1.55, 1.56

[cvs at kolab.org]

Author: marcus

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

Modified Files:
	common gentoo kolab suse 
Log Message:

* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
  dist_conf/gentoo: Added new variable TAR
* kolab_bootstrap.in: Added a condition to the slave setup so that
  it won't try to edit the @sysconfdir@/rc.conf file if kolabd was built
  with --without-openpkg

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- common	8 Jan 2007 21:28:14 -0000	1.34
+++ common	11 Feb 2007 14:47:51 -0000	1.35
@@ -18,6 +18,7 @@
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
 	-e 's,[@]RPM[@],$(RPM),g' \
+	-e 's,[@]TAR[@],$(TAR),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
 	-e 's,[@]aliases_file[@],$(aliases_file),g' \

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gentoo	8 Jan 2007 21:28:14 -0000	1.8
+++ gentoo	11 Feb 2007 14:47:51 -0000	1.9
@@ -34,6 +34,7 @@
 KOLABRC=${bindir}/openpkg
 
 RPM=${KOLABRC} rpm
+TAR=/bin/tar
 
 # Define the deamons that are executed with openpkg rc
 LDAPD=openldap

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kolab	8 Jan 2007 21:28:14 -0000	1.41
+++ kolab	11 Feb 2007 14:47:51 -0000	1.42
@@ -22,6 +22,7 @@
 PHP=${bindir}/php
 KOLABRC=${bindir}/openpkg
 RPM=${KOLABRC} rpm
+TAR=${libdir}/openpkg/tar
 
 # Define the deamons that are executed with openpkg rc
 LDAPD=openldap

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- suse	8 Jan 2007 21:28:14 -0000	1.55
+++ suse	11 Feb 2007 14:47:51 -0000	1.56
@@ -13,6 +13,7 @@
 PERL=${bindir}/perl
 PHP=${bindir}/php
 RPM=/bin/rpm
+TAR=/bin/bar
 
 # Define the deamons that are launched from /etc/init.d
 LDAPD=ldap