aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-02-22 20:54:56 -0800
committerGuy Harris <guy@alum.mit.edu>2018-02-23 04:55:37 +0000
commiteb2e9101243fed7f47bf7ade9eacbca0b1ac4c7e (patch)
tree81d1ad00fa962ca9e8632e763610fae39cbb9690
parentdfe22ab861e7f2b618bbe65b0fca32898433216d (diff)
Remove more cruft.
There's no Wireshark.app/Contents/Resources/bin directory; remove the variable containing its path, and the part of an error message that refers to it. Change-Id: Id41cc00a2671925c50b2075dd3e9d0f84d5bd921 Reviewed-on: https://code.wireshark.org/review/26039 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rwxr-xr-xpackaging/macosx/osx-app.sh.in4
1 files changed, 0 insertions, 4 deletions
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in
index ea33a14422..0b5bda776c 100755
--- a/packaging/macosx/osx-app.sh.in
+++ b/packaging/macosx/osx-app.sh.in
@@ -120,7 +120,6 @@ exclude_prefixes="$exclude_prefixes|$qt_frameworks_dir"
# Package paths
pkgexec="$bundle/Contents/MacOS"
pkgres="$bundle/Contents/Resources"
-pkgbin="$pkgres/bin"
pkglib="$bundle/Contents/Frameworks"
pkgplugin="$bundle/Contents/PlugIns/wireshark/@VERSION_MAJOR@.@VERSION_MINOR@"
@@ -392,9 +391,6 @@ else
echo "Could not rewrite dylib paths for bundled libraries. This requires" >&2
echo "the support libraries to be installed in a PREFIX of at least 6 characters in length." >&2
echo "" >&2
- echo "The bundle will still work if the following line is uncommented in" >&2
- echo "Wireshark.app/Contents/Resources/bin/{various scripts}:" >&2
- echo ' export DYLD_LIBRARY_PATH="$TOP/lib"' >&2
exit 1
fi