thomas: server/kolabd Makefile,1.17,1.18

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
the "echo CVS" broke getting the correct KOLAB_VERSION ... fixed


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	3 Mar 2009 17:35:43 -0000	1.17
+++ Makefile	4 Mar 2009 11:58:35 -0000	1.18
@@ -3,7 +3,7 @@
 PACKAGE=kolabd
 VERSION = $(shell grep "m4_define._VERSION" $(PWD)/$(PACKAGE)/configure.ac|sed "s/m4_define(_VERSION,\(.*\))/\1/")
 RELEASE = $(shell date "+%Y%m%d")
-KOLAB_VERSION = $(shell grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS | sed 's/.*"\(.*\)".*/\1/')
+KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"\(.*\)".*/\1/')
 
 MAKETAR = dist