From 7b5c274d8b7a798e5fa63fb4810525eb446f600b Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 22 Oct 2015 11:12:23 -0700 Subject: 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 --- packaging/macosx/osx-app.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'packaging/macosx') 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 -- cgit v1.2.1