thomas: server/kolab-webadmin Makefile,1.16,1.17

cvs at kolab.org cvs at kolab.org
Wed Mar 4 12:58:37 CET 2009


Author: thomas

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

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


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	3 Mar 2009 17:35:43 -0000	1.16
+++ Makefile	4 Mar 2009 11:58:35 -0000	1.17
@@ -1,7 +1,7 @@
 PACKAGE=kolab-webadmin
 VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
 RELEASE:=`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/')
 
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm





More information about the commits mailing list