wilde: server/openldap Makefile,1.24.2.1,1.24.2.2

[cvs at kolab.org]

Author: wilde

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

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/openldap/Makefile,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -d -r1.24.2.1 -r1.24.2.2
--- Makefile	9 Nov 2009 14:23:51 -0000	1.24.2.1
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.24.2.2
@@ -6,19 +6,6 @@
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 KOLABRELEASE = $(RELEASE)
 
-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
-
 SOURCE_0=ftp://ftp.openldap.org/pub/openldap/openldap-release/$(NAME)-$(VERSION).tgz
 EXTRA=fsl.openldap openldap.patch openldap.pc rc.openldap