diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-09-30 13:12:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-09-30 13:12:28 +0000 |
| commit | 2211ab0fba17d71cc25f6b0d026f04d241bbced1 (patch) | |
| tree | a43632d0ddd54f4f87f2a68b79a046f9f60be35b /packaging/macosx/osx-dmg.sh.in | |
| parent | 67da8b61fd5e8cd64bcf2461411cb1e134be2b97 (diff) | |
| download | wireshark-2211ab0fba17d71cc25f6b0d026f04d241bbced1.tar.gz | |
Use macdeployqt to add the Qt bits to our bundle. Put our libraries in
Contents/Frameworks since that's what macdeployqt expects. Have
osx-dmg.sh look at the correct executable.
svn path=/trunk/; revision=52295
Diffstat (limited to 'packaging/macosx/osx-dmg.sh.in')
| -rwxr-xr-x | packaging/macosx/osx-dmg.sh.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in index 8d2abbe181..30d3e225cd 100755 --- a/packaging/macosx/osx-dmg.sh.in +++ b/packaging/macosx/osx-dmg.sh.in @@ -59,6 +59,11 @@ then PATH=$PATH:$developer_path/Tools:$developer_path/usr/bin fi +if [ ! -f "$ws_bin" ] ; then + # Assume it's a native (Qt) build + ws_bin="$app_bundle/Contents/MacOS/Wireshark" +fi + # Help message #---------------------------------------------------------- help() |