diff options
author | David M. Lee <dlee@digium.com> | 2013-01-18 21:35:09 +0000 |
---|---|---|
committer | David M. Lee <dlee@digium.com> | 2013-01-18 21:35:09 +0000 |
commit | 7bd50bc0c4e27adbbc619a74bd22fb6bf7333321 (patch) | |
tree | 70eade721ba432c963a443c367f211b9bb8826a4 /Makefile | |
parent | 0fd34b8c0a01827880555239354cca8746782c83 (diff) |
Specify the -rpath linker flag when prefix != /usr.
This allows Asterisk to start without having to specify the
LD_LIBRARY_PATH. This can be disabled by passing --disable-rpath to
configure.
(closes issue ASTERISK-20407)
Reported by: David M. Lee
Review: https://reviewboard.asterisk.org/r/2132/
........
Merged revisions 379475 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -252,7 +252,7 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree) ifneq ($(findstring darwin,$(OSARCH)),) _ASTCFLAGS+=-D__Darwin__ - _SOLINK=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace + _SOLINK=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6) _SOLINK+=/usr/lib/bundle1.o endif @@ -268,6 +268,9 @@ else endif endif +# Include rpath settings +_ASTLDFLAGS+=$(AST_RPATH) + ifeq ($(OSARCH),SunOS) SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt DYLINK=$(SOLINK) |