fixed some gstep-make compile issues

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@615 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/SOGoUI/GNUmakefile.preamble b/SOGo/UI/SOGoUI/GNUmakefile.preamble
index 90285bcdc764315eb5ba10b3d86ff04a4aa9e549..c265788582ab4d588decf5dee4f46d2c832f55b5 100644 (file)
--- a/SOGo/UI/SOGoUI/GNUmakefile.preamble
+++ b/SOGo/UI/SOGoUI/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id$
+# compile settings
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
        RELBUILD_DIR_libSOGoCommonUI = $(GNUSTEP_OBJ_DIR)
@@ -12,3 +12,4 @@ libSOGoUI_LIBRARIES_DEPEND_UPON += \
        -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib

diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make
index 932385614ae1652959783ad109895c921357be3a..5615c10e5c5f6cf5da859b2f888e9d553282f479 100644 (file)
--- a/SOGo/UI/common.make
+++ b/SOGo/UI/common.make
@@ -13,6 +13,13 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I../../..      \
        -I../../SoObjects
 
+ifeq ($(GNUSTEP_BUILD_DIR),)
+
+ADDITIONAL_LIB_DIRS +=                                 \
+       -L../SOGoUI/$(GNUSTEP_OBJ_DIR)          \
+       -L../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)
+
+else
 RELBUILD_DIR_libSOGo = \
        $(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libSOGoUI = \
@@ -24,8 +31,9 @@ ADDITIONAL_LIB_DIRS +=                                \
        -L$(RELBUILD_DIR_libSOGo)               \
        -L$(RELBUILD_DIR_libSOGoUI)             \
        -L$(RELBUILD_DIR_libOGoContentStore)
+endif
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS += \
        -lSOGoUI                                \