thomas: server/kolabd Makefile,1.16,1.17

cvs at kolab.org cvs at kolab.org
Tue Mar 3 18:35:45 CET 2009


Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Use KOLAB_VERSION from install-kolab.sh instead of "CVS" when running "make"


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	18 Feb 2009 17:50:42 -0000	1.16
+++ Makefile	3 Mar 2009 17:35:43 -0000	1.17
@@ -3,6 +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/')
 
 MAKETAR = dist
 
@@ -30,7 +31,7 @@
 	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab --enable-dist=kolab \
 		&& make clean distcheck && mv $(PACKAGE)-$(VERSION).tar.bz2 $(KOLABRPMSRC)/$(PACKAGE)
 	cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS'
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version $(KOLAB_VERSION)'
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
 
 binary:





More information about the commits mailing list