git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1137 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / SoObjects / common.make

diff --git a/SoObjects/common.make b/SoObjects/common.make
index 8b1fb43d98ffb0bf2f9ebee77630fd9d7d11d639..096c7a6de687108797b219f124c5870cf91d1496 100644 (file)
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -6,19 +6,23 @@ 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)
 WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)
 WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)
 
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+# SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I.. \
-       -I../..
+       -I../.. \
+        -I../../SOPE
 
 ADDITIONAL_LIB_DIRS += \
-       -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-       -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/
+        -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
+       -L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
+       -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
+       -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
+        -L/usr/local/lib
 
 BUNDLE_LIBS += \
        -lSOGo                                  \