wilde: server/kolabd Makefile,1.18.2.1,1.18.2.2

[cvs at kolab.org]

Author: wilde

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

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/kolabd/Makefile,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- Makefile	9 Nov 2009 14:23:51 -0000	1.18.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.18.2.2
@@ -9,23 +9,6 @@
 
 MAKETAR = dist
 
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: