diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-17 15:05:43 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-17 22:06:12 +0000 |
| commit | 93b5a313ada6684c7706da7a578f7787344d6144 (patch) | |
| tree | 24919a88a574817c9593be39f656f0a9d8470ab4 /packaging/macosx/osx-app.sh | |
| parent | ba6eb5c72ffe82ca0e51c7083240975a5b118ad2 (diff) | |
| download | wireshark-93b5a313ada6684c7706da7a578f7787344d6144.tar.gz | |
When building an OS X package for GTK+, put the libraries in lib.
This reverts to the way we did it prior to the switch to Qt; with GTK+,
Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is
in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry
would be @executable_path/../lib - @executable_path/../Frameworks, which
works for the Qt version, in which Contents/MacOS/Wireshark is the
actual executable, doesn't work for the GTK+ version.
This should fix bug 10185.
Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65
Reviewed-on: https://code.wireshark.org/review/2347
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx/osx-app.sh')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 1f82c96018..556e712c0a 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -206,16 +206,21 @@ resdir=`pwd` pkgexec="$bundle/Contents/MacOS" pkgres="$bundle/Contents/Resources" pkgbin="$pkgexec" -if [ "$ui_toolkit" = "gtk" ] ; then - pkgbin="$pkgres/bin" -fi -# Should pkglib be Contents/Frameworks instead? -#pkglib="$pkgres/lib" pkglib="$bundle/Contents/Frameworks" pkgqtplugin="$bundle/Contents/PlugIns" pkgplugin="$bundle/Contents/PlugIns/wireshark" pkgpython="$pkglib/wireshark/python" +# +# For Qt, the Wireshark binary is the main binary of the app bundle. +# For GTK+, the Wireshark binary is wireshark-bin in +# Contents/Resources/bin, so some of the above setting have to change. +# +if [ "$ui_toolkit" = "gtk" ] ; then + pkgbin="$pkgres/bin" + pkglib="$pkgres/lib" +fi + mkdir -p "$pkgexec" mkdir -p "$pkgbin" mkdir -p "$pkgqtplugin" |