Install libs to /usr/lib

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

diff --git a/Protocols/common.make b/Protocols/common.make
index 7bd55dcced890aed08b4c7707723a3653743822e..03d2f33de0c32843a5e0eba11ac14a5de8d8188c 100644 (file)
--- a/Protocols/common.make
+++ b/Protocols/common.make
@@ -1,28 +1,33 @@
 # common make file for Protocol bundles
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
 include ./Version
 
 BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I..            \
        -I../..         \
        -I../../..      \
-       -I../../SoObjects
+       -I../../SoObjects \
+       -I../../SOPE
 
+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_libOGoContentStore = \
-       $(GNUSTEP_BUILD_DIR)/../../../SOGo/OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
+       $(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
 
 ADDITIONAL_LIB_DIRS +=                                 \
+       -L$(RELBUILD_DIR_libNGCards)            \
        -L$(RELBUILD_DIR_libSOGo)               \
        -L$(RELBUILD_DIR_libOGoContentStore)
 
+# todo: use SYSTEM_LIB_DIR?
 ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS +=                                 \
@@ -30,6 +35,6 @@ BUNDLE_LIBS +=                                        \
        -lOGoContentStore                       \
        -lGDLAccess                             \
        -lNGObjWeb                              \
-       -lNGMime -lNGiCal -lNGLdap              \
+       -lNGMime -lNGCards -lNGLdap             \
        -lNGStreams -lNGExtensions -lEOControl  \
        -lXmlRpc -lDOM -lSaxObjC