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

cvs at kolab.org cvs at kolab.org
Sun May 16 11:45:07 CEST 2010


Author: gunnar

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

Modified Files:
	kolab.mk 
Log Message:
kolab/issue4393 (CVS build failure: environment variables not set when invoking ) 

Index: kolab.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/kolab.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab.mk	12 Feb 2010 20:02:53 -0000	1.7
+++ kolab.mk	16 May 2010 09:45:05 -0000	1.8
@@ -1,12 +1,12 @@
 KOLAB_VERSION = 2.2.3
 
 # Check if we are in a test environment
-TEST_ENVIRONMENT=$(shell test -e test_environment && echo YES)
+TEST_ENVIRONMENT=$(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)
+    BINARY_PKGS_DIR=$(. test_environment && echo $$BINARY_PKGS_DIR)
+    SOURCE_PKGS_DIR=$(.  test_environment && echo $$SOURCE_PKGS_DIR)
+    KOLABDIR=$(. test_environment && echo $$KOLABDIR)
+    KOLABUID=$(. test_environment && echo $$KOLABUID)
     OPENPKG=$(KOLABDIR)/bin/openpkg
 else
     BINARY_PKGS_DIR=/root/kolab-server-$(KOLAB_VERSION)/ix86-debian5.0 





More information about the commits mailing list