Fix libssh re-linking error (it ended up linked as @rpath/libssh.4.dylib)

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index b61a08a0176edf476596882f992a618a0a7020dd..573069424e0361021b1abe52621c110ec64a4747 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -284,7 +284,7 @@ function relink_relative {
     local linkers=("$@")
 
     for obj in "${linkers[@]}"; do
     local linkers=("$@")
 
     for obj in "${linkers[@]}"; do

-       deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu)"`
+       deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu|libssh)"`

        changes=""
        for dep in $deps; do
            base=`basename $dep`
        changes=""
        for dep in $deps; do
            base=`basename $dep`


@@ -313,11 +313,11 @@ function relink_absolute {
     local linkers=("$@")
 
     for obj in "${linkers[@]}"; do
     local linkers=("$@")
 
     for obj in "${linkers[@]}"; do

-       deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu)"`
-       for dep in $deps; do
-           base=`basename $dep`
-            install_name_tool -change "$dep" "$target"/$base -id `basename "$obj"` "$obj"
-       done
+               deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu|libssh)"`
+               for dep in $deps; do
+                       base=`basename $dep`
+                       install_name_tool -change "$dep" "$target"/$base -id `basename "$obj"` "$obj"
+               done

     done
 }
 
     done
 }