summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-01-05 23:11:38 +0000
committerGuy Harris <guy@alum.mit.edu>2013-01-05 23:11:38 +0000
commit2b3849b3d8fcec142e4c8fbe2fce6a96c89ea311 (patch)
tree163965b5a8874f59e963573e5dfdf116457d0462 /packaging
parenta70b2c5208d2e65a35268dff0681c3df731024d3 (diff)
downloadwireshark-2b3849b3d8fcec142e4c8fbe2fce6a96c89ea311.tar.gz
Default to LIBPREFIX being /usr/local, as that's where macosx-setup.sh
puts them. If you choose to use MacPorts versions of the library, edit the script or run it with -l. Update the usage message and fix a typo. svn path=/trunk/; revision=46955
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/osx-app.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index c87125eed0..8227f2a1a1 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -57,9 +57,11 @@ binary_list="
wireshark
"
-# Location for libraries (MacPorts defaults to /opt/local)
+# Location for libraries (macosx-setup.sh defaults to whatever the
+# various support libraries use as their standard installation location,
+# which is /usr/local)
if [ -z $LIBPREFIX ]; then
- LIBPREFIX="/opt/local"
+ LIBPREFIX="/usr/local"
fi
@@ -79,15 +81,16 @@ OPTIONS
-s
strip the libraries and executables from debugging symbols
-l,--libraries
- specify the path to the librairies Wireshark depends on
- (typically /sw or /opt/local)
+ specify the path to the libraries Wireshark depends on
+ (typically /sw or /opt/local). By default it is
+ /usr/local.
-bp,--binary-path
specify the path to the Wireshark binaries. By default it
- is in $binary_path
+ is /tmp/inst/bin.
-p,--plist
specify the path to Info.plist. Info.plist can be found
in the base directory of the source code once configure
- has been run
+ has been run.
EXAMPLE
$0 -s -l /opt/local -bp ../../Build/bin -p Info.plist