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:50:01 +0000 |
commit | 92ea8f8e12209028c24f15df95b6d4b657213ef3 (patch) | |
tree | 32520fe3bec4b79cd2560a8e78d03396275a8733 /packaging | |
parent | a51f82bfecf63a8d50caa3851553b05bc55d7bda (diff) | |
download | wireshark-92ea8f8e12209028c24f15df95b6d4b657213ef3.tar.gz |
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>
(cherry picked from commit 7b5c274d8b7a798e5fa63fb4810525eb446f600b)
Reviewed-on: https://code.wireshark.org/review/11216
Diffstat (limited to 'packaging')
-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 |