diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-10-22 11:12:23 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-10-22 18:15:23 +0000 |
commit | 7b5c274d8b7a798e5fa63fb4810525eb446f600b (patch) | |
tree | b8944c9a4db8c3e4a841598ea2984aab35f34e5d /packaging/macosx | |
parent | 0770b0ac6a6ab0ac29a697a4774be93ffb334172 (diff) |
osx-app.sh: Fix bundling.
When creating a bundle using osx-app.sh (i.e. when we're using
Autotools), make sure we copy androiddump to the extcap subdirectory.
Change-Id: Iabb24ae969ae77856f15dd94120cc6e395311198
Reviewed-on: https://code.wireshark.org/review/11215
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/macosx')
-rwxr-xr-x | packaging/macosx/osx-app.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 2ef0ce5e8d..85fa782277 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -261,6 +261,7 @@ create_bundle() { fi mkdir -p "$pkgexec" + mkdir -p "$pkgexec/extcap" mkdir -p "$pkgbin" mkdir -p "$pkgplugin" @@ -300,9 +301,15 @@ create_bundle() { done elif [ "$ui_toolkit" = "qt" ] ; then for binary in $binary_list ; do + bin_dest="$pkgexec" + if [ "$( dirname $binary )" == "extcap" ] ; then + binary=$( basename $binary ) + bin_dest="$pkgexec/$( dirname $binary )" + fi + # Copy the binary to its destination - cp -v "$binary_path/$binary" "$pkgexec" - cs_binary_list="$cs_binary_list $pkgexec/$binary" + cp -v "$binary_path/$binary" "$bin_dest" + cs_binary_list="$cs_binary_list $bin_dest/$binary" done fi |