From 3d7b72817301530000efd2ae44d7b34bbe57318d Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 16 Apr 2015 11:38:04 -0700
Subject: Make androiddump loadable on OS X.

Make sure the target location for extcap executables and extcap_dir
match on OS X.

Set the extcap directory to Contents/MacOS/extcap. The Mac Developer
Library documentation doesn't explicitly define "Resources", but
examples include data files and not executables. It does state that
executables shouldn't go into PlugIns.

Make sure we rpathify androiddump.

Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94
Reviewed-on: https://code.wireshark.org/review/8093
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 packaging/macosx/osx-app.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packaging/macosx')

diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 325de56862..d30b722226 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -583,6 +583,7 @@ rpathify_files () {
 		rpathify_dir "$pkglib/pango/$pango_version/modules" "*.so"
 	fi
 	rpathify_dir "$pkgbin" "*"
+	rpathify_dir "$pkgbin/extcap" "*"
 }
 
 if [ "$ui_toolkit" = "qt" ] ; then
-- 
cgit v1.2.3