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

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


Author: thomas

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

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


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	13 Sep 2007 14:47:28 -0000	1.15
+++ Makefile	3 Mar 2009 17:35:43 -0000	1.16
@@ -1,6 +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/')
 
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm
@@ -20,7 +21,7 @@
 	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/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)'
 
 binary:
 	$(RPM) -bB $(PACKAGE).spec





More information about the commits mailing list