From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 24 Feb 2005 18:29:39 +0000 (+0000)
Subject: fixed some gstep-make compile issues
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6841ba2362c7a3b038a690067b9d7be719e0213d;p=scalable-opengroupware.org

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 90285bcd..c2657885 100644
--- 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 93238561..5615c10e 100644
--- 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				\