diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-01-05 23:31:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-01-05 23:31:08 +0000 |
| commit | 80e599e4110145bc62b08a6303e9d3cad6f2a834 (patch) | |
| tree | 720eaf87070c654a66a4c0f49fe8eefd6ee53c49 /packaging/macosx/osx-dmg.sh.in | |
| parent | 33981700b5530c67f915b3e0f60dda5131faec4c (diff) | |
| download | wireshark-80e599e4110145bc62b08a6303e9d3cad6f2a834.tar.gz | |
Don't assume developer tools are under /Developer - look for
/Applications/Xcode.app/Developer first (for Xcode 4 and later) and, if
we don't find that, look for /Developer.
Don't assume packagemaker is under $developer_path/usr/bin - with Xcode
4, you need to install Auxiliary Tools for Xcode to get PackageMaker,
and even that doesn't directly install the packagemaker command, so we
currently advise people to copy the PackageMaker binary to
/usr/bin/packagemaker.
svn path=/trunk/; revision=46957
Diffstat (limited to 'packaging/macosx/osx-dmg.sh.in')
| -rwxr-xr-x | packaging/macosx/osx-dmg.sh.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in index 07ecf30a03..8d2abbe181 100755 --- a/packaging/macosx/osx-dmg.sh.in +++ b/packaging/macosx/osx-dmg.sh.in @@ -47,7 +47,17 @@ auto_open_opt= utilities="Utilities" ws_bin="$app_bundle/Contents/Resources/bin/wireshark-bin" -PATH=$PATH:/Developer/Tools +if [ -d /Applications/Xcode.app/Developer ] +then + developer_path=/Applications/Xcode.app/Developer +elif [ -d /Developer ] +then + developer_path=/Developer +fi +if [ ! -z $developer_path ] +then + PATH=$PATH:$developer_path/Tools:$developer_path/usr/bin +fi # Help message #---------------------------------------------------------- @@ -132,7 +142,7 @@ echo -e "\nCREATE WIRESHARK PACKAGE\n" pkg_title="$volume_name $version $architecture" pkg_file="$pkg_title.pkg" rm -rf "$pkg_file" -/Developer/usr/bin/packagemaker --doc "Wireshark_package.pmdoc" \ +packagemaker --doc "Wireshark_package.pmdoc" \ --title "$pkg_title" \ --version "$version" \ --verbose || exit 1 |