From 6be9cb9dee2fc8df59604aa28413625898e70945 Mon Sep 17 00:00:00 2001
From: Fabrizio Fabbri <ffabbri4@bloomberg.net>
Date: Thu, 19 Jan 2017 23:12:43 +0100
Subject: [PATCH] osx: fix #343 runtime path

---
 src/aclocal.m4 | 4 ++--
 src/configure  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e8f4b8e76..bb42eb49f 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -402,7 +402,7 @@ case "${host_os}" in
                 PICFLAG='-fPIC -fno-common'
                 SHARED_LDFLAGS="-dynamiclib -flat_namespace -undefined suppress ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-bundle ${LDFLAGS}"
-                ECL_LDRPATH=''
+                ECL_LDRPATH='-Wl,-rpath,~A'
                 THREAD_CFLAGS='-D_THREAD_SAFE'
                 THREAD_LIBS='-lpthread'
                 # The GMP library has not yet been ported to Intel-OSX
@@ -429,7 +429,7 @@ case "${host_os}" in
                   ECL_GC_DIR=bdwgc
                 fi
                 SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
-                SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
+                SONAME_LDFLAGS="-Wl,-install_name,@rpath/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
                 ;;
         nsk*)
                 # HP Non-Stop platform
diff --git a/src/configure b/src/configure
index 54c3af9ff..0c6029dcc 100755
--- a/src/configure
+++ b/src/configure
@@ -5032,7 +5032,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
                 PICFLAG='-fPIC -fno-common'
                 SHARED_LDFLAGS="-dynamiclib -flat_namespace -undefined suppress ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-bundle ${LDFLAGS}"
-                ECL_LDRPATH=''
+                ECL_LDRPATH='-Wl,-rpath,~A'
                 THREAD_CFLAGS='-D_THREAD_SAFE'
                 THREAD_LIBS='-lpthread'
                 # The GMP library has not yet been ported to Intel-OSX
@@ -5059,7 +5059,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
                   ECL_GC_DIR=bdwgc
                 fi
                 SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
-                SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
+                SONAME_LDFLAGS="-Wl,-install_name,@rpath/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
                 ;;
         nsk*)
                 # HP Non-Stop platform