Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir

instead of top_srcdir. It shouldn't make any difference in our case but
it's more correct.

svn path=/trunk/; revision=52302

diff --git a/Makefile.am b/Makefile.am
index a65644009976df465c0f3993ea17af5086e16106..415d37d6a7b6dab31d2f0a5f9c6191d117be65e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1084,7 +1084,7 @@ install_desktop_files:
 
 # Used by svr4-package and osx-package
 # We load top_stagedir with an explicit path so that libtool doesn't freak.
-top_stagedir=`cd $(top_srcdir) && pwd`/packaging/staging
+top_stagedir=`cd $(top_builddir) && pwd`/packaging/staging
 stagedir=$(top_stagedir)/$(PACKAGE).inst
 
 host_cpu=@host_cpu@

diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 9bf21aa138bece0954781a72c12ba1f0b71b986a..b01d5601007d10f794e703d4e20d39f75bc109e1 100755 (executable)
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -264,10 +264,11 @@ chmod -R g-w "$chmodbpf_dir"
 # The rest of the Wireshark installation (we handled bin above)
 rsync -av \
        --exclude bin/ \
-       --exclude lib/wireshark/plugins/ \
-       --exclude lib/wireshark/python/ \
+       --exclude lib/ \
        "$binary_path/.."/* "$pkgres"
 
+rsync -av $binary_path/../lib/*.dylib "$pkglib/"
+
 # Remove the version number from the plugin path
 find "$binary_path/../lib/wireshark/plugins" -type f \
        -exec cp -fv "{}" "$pkgplugin/" \;