Make shared libraries relocatable.

Author: pavoljuhas

Linux/makedist

@@ -56,7 +56,7 @@ gitrepos=(
         master:v1.3.1
     libobjcryst
         https://github.com/diffpy/libobjcryst.git
-        master:v2015.1.1
+        master:5d0cdbca8c6c9fa86ddd7d82e51999456c36be2b
     diffpy.srreal
         https://github.com/diffpy/diffpy.srreal.git
         master:v1.1

Linux/src-addons/diffpy.srreal/sconscript.local

@@ -3,6 +3,9 @@
 Import('env')
 
 # Set RPATH to find the libdiffpy.so in the parent lib directory.
-env.AppendUnique(LINKFLAGS="-Wl,-rpath,'$$ORIGIN/../../../../..'")
+rpath_quoted = "'$$ORIGIN/../../../../..'"
+if env['PLATFORM'] == 'darwin':
+    rpath_quoted = rpath_quoted.replace('$$ORIGIN', '@loader_path')
+env.Prepend(LINKFLAGS="-Wl,-rpath," + rpath_quoted)
 
 # vim: ft=python

Linux/src-addons/libdiffpy/sconscript.local

@@ -5,7 +5,13 @@ Import('env')
 
 # Set RPATH to make the libdiffpy shared library search its
 # own directory for other required shared libraries.
-env.AppendUnique(LINKFLAGS="-Wl,-rpath,'$$ORIGIN'")
+rpath_quoted = "'$$ORIGIN'"
+if env['PLATFORM'] == 'darwin':
+    rpath_quoted = rpath_quoted.replace('$$ORIGIN', '@loader_path')
+env.Prepend(LINKFLAGS="-Wl,-rpath," + rpath_quoted)
+
+if env['PLATFORM'] == 'darwin':
+    env.Replace(DARWIN_INSTALL_NAME='@rpath/$TARGET.file')
 
 # determine installation path of the cxxtest framework
 env['CXXTEST_INSTALL_DIR'] = os.path.abspath(

Linux/src-addons/libobjcryst/sconscript.local

@@ -0,0 +1,8 @@
+# Local tweaks to the scons build environment.
+
+Import('env')
+
+if env['PLATFORM'] == 'darwin':
+    env.Replace(DARWIN_INSTALL_NAME='@rpath/$TARGET.file')
+
+# vim: ft=python

Linux/src-addons/pyobjcryst/sconscript.local

@@ -3,6 +3,9 @@
 Import('env')
 
 # Set RPATH to find the libObjCryst.so in the parent lib directory.
-env.AppendUnique(LINKFLAGS="-Wl,-rpath,'$$ORIGIN/../../../..'")
+rpath_quoted = "'$$ORIGIN/../../../..'"
+if env['PLATFORM'] == 'darwin':
+    rpath_quoted = rpath_quoted.replace('$$ORIGIN', '@loader_path')
+env.Prepend(LINKFLAGS="-Wl,-rpath," + rpath_quoted)
 
 # vim: ft=python