amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-17 07:33:57 +00:00
Code Issues Projects Releases Wiki Activity

Adjusted the rpath, removed unnecessary variables/values

Browse Source
This commit is contained in:
Ludovic Marcotte
2014-10-14 09:51:04 -04:00
parent ccabd93ff2
commit f663950808
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Main/GNUmakefile
View File

@@ -6,8 +6,7 @@ include ../Version
ADDITIONAL_OBJCFLAGS += -fPIE ADDITIONAL_OBJCFLAGS += -fPIE
ADDITIONAL_INCLUDE_DIRS += ADDITIONAL_INCLUDE_DIRS +=
ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
SOGOD = sogod SOGOD = sogod
TOOL_NAME = $(SOGOD) TOOL_NAME = $(SOGOD)

6
Main/GNUmakefile.preamble
View File

@@ -9,11 +9,9 @@ ADDITIONAL_INCLUDE_DIRS += \
-I.. -I..
ADDITIONAL_LIB_DIRS += \ ADDITIONAL_LIB_DIRS += \
-L../SoObjects/SOGo/SOGo.framework/sogo \ -L../SoObjects/SOGo/SOGo.framework/sogo \
-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \ -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
-L/usr/local/lib/sogo -L/usr/lib/sogo -L/usr/lib64/sogo -L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
$(SOGOD)_TOOL_LIBS += \ $(SOGOD)_TOOL_LIBS += \
-lSOGo \ -lSOGo \