steffen: server/imap Makefile,1.5,1.6

[cvs at kolab.org]

Author: steffen

Update of /kolabrepository/server/imap
In directory doto:/tmp/cvs-serv28934/imap

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imap/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	20 Dec 2005 09:18:50 -0000	1.5
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.6
@@ -4,6 +4,9 @@
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
+ifeq "x$(KOLABRPMPKG)" "x"
+  KOLABRPMPKG = /kolab/RPM/PKG
+endif
 ifeq "x$(KOLABCVSDIR)" "x"
   KOLABCVSDIR = $(CURDIR)
 endif
@@ -16,18 +19,22 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=$(KOLABCVSDIR)/imap.annotate.patch
+
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab.patch Makefile
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/   # Patch to add annotate support  
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for imap.spec
-	cp $(KOLABCVSDIR)/imap.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/   # Patch to add annotate support  
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_annotate yes'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
 
 imap-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/imap-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp -p $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/imap-*