Fix loader_path and executable_path

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}"
 

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}")
+set -x
-   cp -p "${1}" "${LIBPATH}"
+   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}"
+   path=$(resolve "${lib}")
-   update_paths "${lib}"
+   install_name_tool -change "${lib}" "@executable_path/../Frameworks/${path##*/}" "${EXEPATH}"
+   update_paths "${path}"
 done
 
 exit 0