From 3416bfea94f17dd26b55bb4133c431f2640c9371 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 14 Oct 2014 10:00:05 -0400 Subject: [PATCH] Adjusted rpath and removed unusued -L directives --- ActiveSync/common.make | 2 +- Tools/GNUmakefile | 2 +- Tools/GNUmakefile.preamble | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ActiveSync/common.make b/ActiveSync/common.make index bf77fa3be..15024630c 100644 --- a/ActiveSync/common.make +++ b/ActiveSync/common.make @@ -20,7 +20,7 @@ ADDITIONAL_LIB_DIRS += \ -L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \ -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \ -L/usr/local/lib \ - -Wl,-rpath,$(SOGO_SYSLIBDIR)/sogo + -Wl,-rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo BUNDLE_LIBS += \ -lSOGo \ diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index ec65344f3..bb580edc9 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -4,7 +4,7 @@ include ../config.make include $(GNUSTEP_MAKEFILES)/common.make include ../Version -ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo +ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo ### SOGO_TOOL = sogo-tool diff --git a/Tools/GNUmakefile.preamble b/Tools/GNUmakefile.preamble index 1cf88ce79..f6ed0bb7f 100644 --- a/Tools/GNUmakefile.preamble +++ b/Tools/GNUmakefile.preamble @@ -13,4 +13,4 @@ ADDITIONAL_LIB_DIRS += \ -L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \ -L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \ -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \ - -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb + -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb