From 9f45bac313f1bedffa4e5b7c7972a43f4a665586 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 7 Oct 2013 19:37:22 +0000
Subject: Try to fix building the GTK flavor OS X app.

svn path=/trunk/; revision=52442
---
 packaging/macosx/osx-app.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'packaging')

diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 46ff47992b..9b58ff5fb4 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -208,6 +208,9 @@ resdir=`pwd`
 pkgexec="$package/Contents/MacOS"
 pkgres="$package/Contents/Resources"
 pkgbin="$pkgexec"
+if [ "$ui_toolkit" = "gtk" ] ; then
+	pkgbin="$pkgres/bin"
+fi
 # Should pkglib be Contents/Frameworks instead?
 #pkglib="$pkgres/lib"
 pkglib="$package/Contents/Frameworks"
@@ -247,14 +250,16 @@ echo -e "\nFilling app bundle and utility directory...\n"
 # Wireshark executables
 if [ "$ui_toolkit" = "gtk" ] ; then
 	cp -v utility-launcher "$cli_dir/$binary"
-	for binary in wireshark $binary_list ; do
+	for binary in $binary_list wireshark ; do
 		# Copy the binary to its destination
 		dest_path="$pkgbin/$binary-bin"
 		cp -v "$binary_path/$binary" "$dest_path"
 		# TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not
 
-		ln -sv ./wireshark "$pkgbin/$binary"
-		ln -sv ./wireshark "$cli_dir/$binary"
+		if [ "$binary" != "wireshark" ] ; then
+			ln -sv ./wireshark "$pkgbin/$binary"
+			ln -sv ./wireshark "$cli_dir/$binary"
+		fi
 	done
 elif [ "$ui_toolkit" = "qt" ] ; then
 	for binary in $binary_list ; do
-- 
cgit v1.2.1