steffen: server/postfix Makefile,1.15,1.16

[cvs at kolab.org]

Author: steffen

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

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

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	20 Dec 2005 09:53:48 -0000	1.15
+++ Makefile	6 Nov 2006 13:22:37 -0000	1.16
@@ -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,19 +19,24 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=$(KOLABCVSDIR)/postfix-ldap-leafonly.patch \
+	$(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch
+
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
-	cp $(KOLABCVSDIR)/postfix-ldap-leafonly.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for postfix.spec
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_ldap yes' --define 'with_sasl yes' --define 'with_ssl yes'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
 
 postfix-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/postfix-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch
+	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm