gunnar: server/make-helper kolab.mk,1.6,1.7

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv20887/make-helper

Modified Files:
	kolab.mk 
Log Message:
Allow to install several servers on the same machine with the install-server targets. Add a KOLAB_VERSION variable.

Index: kolab.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/kolab.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab.mk	9 Feb 2010 16:18:55 -0000	1.6
+++ kolab.mk	12 Feb 2010 20:02:53 -0000	1.7
@@ -1,19 +1,23 @@
+KOLAB_VERSION = 2.2.3
+
 # Check if we are in a test environment
 TEST_ENVIRONMENT=$(shell test -e test_environment && echo YES)
 ifeq "x$(TEST_ENVIRONMENT)" "xYES"
     BINARY_PKGS_DIR=$(shell source test_environment && echo $$BINARY_PKGS_DIR)
     SOURCE_PKGS_DIR=$(shell source test_environment && echo $$SOURCE_PKGS_DIR)
+    KOLABDIR=$(shell source test_environment && echo $$KOLABDIR)
+    KOLABUID=$(shell source test_environment && echo $$KOLABUID)
+    OPENPKG=$(KOLABDIR)/bin/openpkg
+else
+    BINARY_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/ix86-debian5.0 
+    SOURCE_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/sources
+    KOLABUID=19414
 endif
 
 # Initial sanity check for the OpenPKG tool
-OPENPKG=$(shell which openpkg && echo YES)
+OPENPKG ?= $(shell which openpkg && echo YES)
 ifeq "x$(OPENPKG)" "x"
-  ifeq "x$(TEST_ENVIRONMENT)" "x"
-    $(error Did not find the "openpkg" tool. Make sure your environment settings are sane. On a standard kolab system you might need to run "eval `/kolab/etc/rc --eval all env`")
-  else
-    KOLABDIR=$(shell source test_environment && echo $$KOLABDIR)
-    OPENPKG=$(KOLABDIR)/bin/openpkg
-  endif
+  $(error Did not find the "openpkg" tool. Make sure your environment settings are sane. On a standard kolab system you might need to run "eval `/kolab/etc/rc --eval all env`")
 endif
 
 # Set KOLABDIR to the base directory of the OpenPKG/Kolab installation if it is unset