X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=UI%2Fcommon.make;h=1efe9382778e9468bf2495a95a4bca0e062077eb;hb=4d13c0152a4d916246309b7bd1295d78c0e201b9;hp=f1c5fdb8f866ade9ef91d920dd573908286a47a0;hpb=219ffc26210dcc8b83cb64733091c56b3bfa0060;p=scalable-opengroupware.org

diff --git a/UI/common.make b/UI/common.make
index f1c5fdb8..1efe9382 100644
--- a/UI/common.make
+++ b/UI/common.make
@@ -6,21 +6,25 @@ include ../../Version
 include ./Version
 
 BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I..		\
 	-I../..		\
 	-I../../..	\
-	-I../../SoObjects
+	-I../../SoObjects \
+	-I../../SOPE
 
 ifeq ($(GNUSTEP_BUILD_DIR),)
 
 ADDITIONAL_LIB_DIRS += 				\
+        -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)	\
 	-L../SOGoUI/$(GNUSTEP_OBJ_DIR)		\
 	-L../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)
 
 else
+RELBUILD_DIR_libNGCards = \
+	$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libSOGo = \
 	$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libSOGoUI = \
@@ -29,6 +33,7 @@ RELBUILD_DIR_libOGoContentStore = \
 	$(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
 
 ADDITIONAL_LIB_DIRS += 				\
+	-L$(RELBUILD_DIR_libNGCards)		\
 	-L$(RELBUILD_DIR_libSOGo)		\
 	-L$(RELBUILD_DIR_libSOGoUI)		\
 	-L$(RELBUILD_DIR_libOGoContentStore)