wilde: server/kolab-webadmin Makefile,1.17.2.1,1.17.2.2

[cvs at kolab.org]

Author: wilde

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

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/kolab-webadmin/Makefile,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- Makefile	9 Nov 2009 14:23:50 -0000	1.17.2.1
+++ Makefile	9 Nov 2009 17:08:38 -0000	1.17.2.2
@@ -5,19 +5,6 @@
 RELEASE:=`date '+%Y%m%d'`
 KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"\(.*\)".*/\1/')
 
-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
-
 all:
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \