Remove more cruft.
authorGuy Harris <guy@alum.mit.edu>
Fri, 23 Feb 2018 04:54:56 +0000 (20:54 -0800)
committerGuy Harris <guy@alum.mit.edu>
Fri, 23 Feb 2018 04:55:37 +0000 (04:55 +0000)
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>
packaging/macosx/osx-app.sh.in

index ea33a14422213ef6c0b55f68724adf9367123047..0b5bda776caf7c93dffd8c7409079253177dba93 100755 (executable)
@@ -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