Improved rpath handling (#2996)
parent
7380b25b75
commit
68655deabd
|
@ -20,7 +20,7 @@ ADDITIONAL_LIB_DIRS += \
|
||||||
-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
|
-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
|
||||||
-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
|
-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
|
||||||
-L/usr/local/lib \
|
-L/usr/local/lib \
|
||||||
-Wl,-rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
|
-Wl,-rpath,$(SOGO_SYSLIBDIR)/sogo
|
||||||
|
|
||||||
BUNDLE_LIBS += \
|
BUNDLE_LIBS += \
|
||||||
-lSOGo \
|
-lSOGo \
|
||||||
|
|
|
@ -6,7 +6,7 @@ include ../Version
|
||||||
|
|
||||||
ADDITIONAL_OBJCFLAGS += -fPIE
|
ADDITIONAL_OBJCFLAGS += -fPIE
|
||||||
ADDITIONAL_INCLUDE_DIRS +=
|
ADDITIONAL_INCLUDE_DIRS +=
|
||||||
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)
|
||||||
|
|
|
@ -16,4 +16,4 @@ ADDITIONAL_LIB_DIRS += \
|
||||||
-L/usr/local/lib/sogo -L/usr/lib/sogo -L/usr/lib64/sogo -lEOControl -lNGStreams -lNGMime -lNGExtensions
|
-L/usr/local/lib/sogo -L/usr/lib/sogo -L/usr/lib64/sogo -lEOControl -lNGStreams -lNGMime -lNGExtensions
|
||||||
|
|
||||||
|
|
||||||
ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
|
ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
|
||||||
|
|
|
@ -4,7 +4,7 @@ include ../config.make
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
include ../Version
|
include ../Version
|
||||||
|
|
||||||
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
|
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
|
||||||
|
|
||||||
###
|
###
|
||||||
SOGO_TOOL = sogo-tool
|
SOGO_TOOL = sogo-tool
|
||||||
|
|
|
@ -270,7 +270,7 @@ genConfigMake() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cfgwrite "HOSTNAME=${HOSTNAME}"
|
cfgwrite "HOSTNAME=${HOSTNAME}"
|
||||||
cfgwrite "SOGO_SYSLIBDIR=\${GNUSTEP_LIBRARIES}"
|
cfgwrite "SOGO_SYSLIBDIR=\${GNUSTEP_SYSTEM_LIBRARIES}"
|
||||||
cfgwrite "SOGO_LIBDIR=\${GNUSTEP_LIBRARY}/SOGo"
|
cfgwrite "SOGO_LIBDIR=\${GNUSTEP_LIBRARY}/SOGo"
|
||||||
cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_LIBDIR}/Templates"
|
cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_LIBDIR}/Templates"
|
||||||
cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_LIBDIR}/WebServerResources"
|
cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_LIBDIR}/WebServerResources"
|
||||||
|
|
Loading…
Reference in New Issue