wilde: server/postfix Makefile,1.19.2.2,1.19.2.3

[cvs at kolab.org]

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- Makefile	9 Nov 2009 14:23:56 -0000	1.19.2.2
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.19.2.3
@@ -1,21 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
 PACKAGE=postfix
 VERSION=2.4.6
 RELEASE=20080101
@@ -23,17 +7,17 @@
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch Makefile
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes'
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	wget -c $(OPENPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm