richard: server/kolabd/kolabd Makefile.am, 1.14, 1.15 ChangeLog, 1.36, 1.37

[cvs at intevation.de]

Author: richard

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

Modified Files:
	Makefile.am ChangeLog 
Log Message:
* Makefile.am: added support to install kolabsrv for non openpkg
  based distributions.  kolabsrv is a replacement for the openpkg script
* dist_conf/kolabsrv.in: replaced /bin/bash with @BASH@ and used
  @kolab_rcdir@ for the rc directory
* dist_conf/suse: Updated KOLABRC to use the kolabsrv script



Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	3 Jan 2006 21:59:08 -0000	1.14
+++ Makefile.am	6 Jan 2006 12:24:36 -0000	1.15
@@ -133,9 +133,16 @@
 kolabdocdir = $(pkgdocdir)/@PACKAGE@
 dist_kolabdoc_DATA = $(kolabdoc_FILES)
 
+if OPENPKG
 kolabsbin_FILES = kolabd \
 	kolabconf \
 	kolabcheckperm
+else
+kolabsbin_FILES = kolabd \
+	kolabconf \
+	kolabcheckperm \
+	dist_conf/kolabsrv
+endif	
 
 kolabsbindir = $(sbindir)/
 kolabsbin_DATA = $(kolabsbin_FILES)
@@ -514,6 +521,12 @@
 CLEANFILES += rc.kolabd
 EXTRA_DIST += rc.kolabd.in
 
+dist_conf/kolabsrv:
+	@$(mkinstalldirs) .
+	$(do_subst) <$(srcdir)/dist_conf/kolabsrv.in >$@
+CLEANFILES += dist_conf/kolabsrv
+EXTRA_DIST += dist_conf/kolabsrv.in
+
 # Please update the perl-kolab, kolab-webadmin and kolab-resource-handlers
 # Makefile.ams too when the underneath EXTRA_DIST assignment is altered
 EXTRA_DIST += dist_conf/common \
@@ -538,6 +551,9 @@
 	chmod +744 $(DESTDIR)$(sbindir)/kolabconf
 	chmod +744 $(DESTDIR)$(sbindir)/kolabcheckperm
 	chmod +755 $(DESTDIR)$(bindir)/kolabpasswd
+if ! OPENPKG
+	chmod +755 $(DESTDIR)$(sbindir)/kolabsrv
+endif
 if OPENPKG
 	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
 	chmod +744 $(DESTDIR)$(bindir)/kolab

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	5 Jan 2006 21:58:38 -0000	1.36
+++ ChangeLog	6 Jan 2006 12:24:36 -0000	1.37
@@ -1,3 +1,10 @@
+2006-01-06 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: added support to install kolabsrv for non openpkg
+	  based distributions.  kolabsrv is a replacement for the openpkg script
+	* dist_conf/kolabsrv.in: replaced /bin/bash with @BASH@ and used
+	  @kolab_rcdir@ for the rc directory
+	* dist_conf/suse: Updated KOLABRC to use the kolabsrv script
+
 2006-01-05 Richard Bos <richard at radoeka.nl>
 	* kolab_bootstap.in: unexpanded tabs, to improve readability
 	* dist_conf/kolabsrv.in: added