wilde: server/php-kolab/Kolab_Server Makefile,1.6.2.2,1.6.2.3

[cvs at kolab.org]

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Server
In directory doto:/tmp/cvs-serv27852/php-kolab/Kolab_Server

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/php-kolab/Kolab_Server/Makefile,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- Makefile	9 Nov 2009 14:23:56 -0000	1.6.2.2
+++ Makefile	9 Nov 2009 17:08:45 -0000	1.6.2.3
@@ -1,30 +1,5 @@
 include ../../kolab.mk
 
-# Set the location of the rpm binary
-ifeq "x$(RPM)" "x"
-  RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
-# Set the location for rpm source package installations
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-
-# Set the location for rpm packages
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-
-# Set the location for the rpm temporary directory
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(KOLABDIR)/RPM/TMP
-endif
-
-# Determine the suffix for binary packages on this system
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%)
-endif
-
 # Determine the staging area for collecting new source rpms
 ifeq "x$(STAGING)" "x"
   STAGING = ../../stage