From 02d4e71cf15b3f639285b59356a57d1922014452 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Tue, 21 Jul 2015 22:54:15 -0500
Subject: [PATCH] Fix loader_path and executable_path

---
 mac/scripts/build_dist.sh     |  1 +
 mac/scripts/install_wxlibs.sh | 30 ++++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/mac/scripts/build_dist.sh b/mac/scripts/build_dist.sh
index ba1ce0a89..0a4d3656b 100755
--- a/mac/scripts/build_dist.sh
+++ b/mac/scripts/build_dist.sh
@@ -65,6 +65,7 @@ echo '
 hdiutil convert TMP.dmg -format UDZO -imagekey zlib-level=9 -o "$DMG.dmg"
 
 # Create zip version
+rm -rf "${DMG}/.background"
 rm -rf "${DMG}/Audacity/help/"
 zip -r9 "${DMG}.zip" "${DMG}"
 
diff --git a/mac/scripts/install_wxlibs.sh b/mac/scripts/install_wxlibs.sh
index 5d7d24888..f989d91c1 100755
--- a/mac/scripts/install_wxlibs.sh
+++ b/mac/scripts/install_wxlibs.sh
@@ -1,13 +1,30 @@
 #!/bin/sh
+set -x
+
+resolve()
+{
+set -x
+   dir="${1%/*}"
+   base="${1##*/}"
+   while [ -n "${base}" ]
+   do
+      lib="${dir}/${base}"
+      base=$(readlink "${dir}/${base}")
+   done
+   echo $lib
+}
 
 update_paths()
 {
-   base=$(basename "${1}")
-   cp -p "${1}" "${LIBPATH}"
+set -x
+   path=$(resolve "${1}")
+   base="${path##*/}"
+   cp -p "${path}" "${LIBPATH}"
 
-   for lib in $(otool -L "${1}" | awk '/libwx/{print $1}')
+   for lib in $(otool -L "${path}" | awk '/libwx/{print $1}')
    do
-      install_name_tool -change "${lib}" @loader_path/../Frameworks/$(basename "${lib}") "${LIBPATH}/${base}"
+      path=$(resolve "${lib}")
+      install_name_tool -change "${lib}" "@loader_path/../Frameworks/${path##*/}" "${LIBPATH}/${base}"
    done
 }
 
@@ -18,8 +35,9 @@ mkdir -p "${LIBPATH}"
 
 for lib in $(otool -L "${EXEPATH}" | awk '/libwx/{print $1}')
 do
-   install_name_tool -change "${lib}" @executable_path/../Frameworks/$(basename "${lib}") "${EXEPATH}"
-   update_paths "${lib}"
+   path=$(resolve "${lib}")
+   install_name_tool -change "${lib}" "@executable_path/../Frameworks/${path##*/}" "${EXEPATH}"
+   update_paths "${path}"
 done
 
 exit 0