summaryrefslogtreecommitdiff
path: root/packaging/macosx
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-11-02 10:37:31 -0800
committerGuy Harris <guy@alum.mit.edu>2014-11-02 18:38:02 +0000
commit66e204fd9313fd1714aa789dafca9802fdfc3da9 (patch)
tree1ef6fc269e3586b22afd6a1c7c0e252dad5ec772 /packaging/macosx
parent70cab47fe1d5f4042bd3d608eae30b8188fa8886 (diff)
downloadwireshark-66e204fd9313fd1714aa789dafca9802fdfc3da9.tar.gz
Handle packagemaker being an ordinary command in /usr/bin.
Change-Id: Ic804a0fdb4dc450683f57be4814a347e20ecd401 Reviewed-on: https://code.wireshark.org/review/5079 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx')
-rwxr-xr-xpackaging/macosx/osx-dmg.sh.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in
index 80bfcdbf74..1657148353 100755
--- a/packaging/macosx/osx-dmg.sh.in
+++ b/packaging/macosx/osx-dmg.sh.in
@@ -68,6 +68,10 @@ elif [ -f /Developer/usr/bin/packagemaker ]
then
packagemaker=/Developer/usr/bin/packagemaker
fi
+elif [ -f /usr/bin/packagemaker ]
+then
+ packagemaker=/usr/bin/packagemaker
+fi
if [ -z "$packagemaker" ]
then
echo "$0: couldn't find PackageMaker" 1>&2