gunnar: server/kolabd .cvsignore,NONE,1.1 Makefile,1.14,1.15

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile 
Added Files:
	.cvsignore 
Log Message:
Add make install to the kolabd package.

--- NEW FILE: .cvsignore ---
*.src.rpm

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	11 Dec 2008 16:56:52 -0000	1.14
+++ Makefile	9 Feb 2009 11:44:03 -0000	1.15
@@ -1,6 +1,6 @@
 PACKAGE=kolabd
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
-RELEASE:=`date '+%Y%m%d'`
+VERSION = $(shell grep "m4_define._VERSION" $(PWD)/$(PACKAGE)/configure.ac|sed "s/m4_define(_VERSION,\(.*\))/\1/")
+RELEASE = $(shell date "+%Y%m%d")
 
 MAKETAR = dist
 
@@ -17,18 +17,25 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-all:
+ifeq "x$(PLATTAG)" "x"
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+endif
+
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	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'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
 
 binary:
 	$(RPM) -bB $(PACKAGE).spec
 
 dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+	cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
 
 tar:
 	test -d $(MAKETAR)/$(PACKAGE) || mkdir -p $(MAKETAR)/$(PACKAGE)
@@ -36,3 +43,7 @@
 
 .PHONY: clean_all
 clean_all:
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm