wilde: server kolab.mk,NONE,1.1.2.1 Makefile,1.76.2.1,1.76.2.2

[cvs at kolab.org]

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Added Files:
      Tag: kolab_2_2_branch
	kolab.mk 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

--- NEW FILE: kolab.mk ---
# Set KOLABDIR to the base directory of the OpenPKG/Kolab installation:
KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg)

ifeq ($(KOLABDIR),)
  $(error Could not determine KOLABDIR!)
endif

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.76.2.1
retrieving revision 1.76.2.2
diff -u -d -r1.76.2.1 -r1.76.2.2
--- Makefile	23 Sep 2009 16:18:48 -0000	1.76.2.1
+++ Makefile	9 Nov 2009 14:23:50 -0000	1.76.2.2
@@ -1,13 +1,4 @@
-ifeq "x$(HOME)" "x"
-  HOME = /kolab
-endif
-
-# Don't know if this is correct but if somebody
-# calls this makefile as root we assume that there
-# is an installation in /kolab
-ifeq "x$(HOME)" "x/root"
-  HOME = /kolab
-endif
+include kolab.mk
 
 BASE_PACKAGES=php-smarty              \
               openldap                \
@@ -89,13 +80,13 @@
         php-kolab/Kolab_Storage \
         kolab-webclient
 
-PHPUNIT=$(HOME)/bin/phpunit
+PHPUNIT=$(KOLABDIR)/bin/phpunit
 
-PHPUNIT_TESTS=$(HOME)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_Server/Horde/Kolab/Server/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_Storage/Horde/Kolab/Storage/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
-              $(HOME)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
+PHPUNIT_TESTS=$(KOLABDIR)/lib/php/test/Kolab_Format/Horde/Kolab/Format/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_Server/Horde/Kolab/Server/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_Storage/Horde/Kolab/Storage/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \
+              $(KOLABDIR)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php
 
 .PHONY: dist
 dist: stage base kolab pear files