diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-03-17 01:45:48 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-03-17 01:45:48 +0000 |
| commit | 8b52a810bef0540ef1b1372248baaeb48fa4bc99 (patch) | |
| tree | 82bb27b302ecf095cca3ad108eaff10c554a4c92 /tools | |
| parent | 4abb5c972b583b12a1b3401ca7f7f06af86aae15 (diff) | |
osx_build needs to pay attention to jack_coreaudio.so if we're packaging Jack2
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4851 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/osx_packaging/osx_build | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 1e5cd9bcfc..0cdff4aa1e 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -157,8 +157,11 @@ if test x$STRIP != x ; then strip $APPROOT/MacOS/Ardour2 fi if test x$WITH_JACK != x ; then - cp /usr/local/lib/jack/jack_coreaudio.so $Frameworks - cp /usr/local/bin/jackd $APPROOT/MacOS + if [ -f /usr/local/lib/jack/jack_coreaudio.so ] ; then + cp /usr/local/lib/jack/jack_coreaudio.so $Frameworks + cp /usr/local/bin/jackd $APPROOT/MacOS + JACK_SHARED_OBJECTS="$Frameworks/*.so" + fi fi # copy locale files @@ -322,7 +325,7 @@ done echo "Fixing up library names ..." # now do the same for all the libraries we include -for dylib in $Frameworks/*.so $Frameworks/*.dylib $Frameworks/modules/*.so $Surfaces/*.dylib ; do +for dylib in $JACK_SHARED_OBJECTS $Frameworks/*.dylib $Frameworks/modules/*.so $Surfaces/*.dylib ; do # skip symlinks if test ! -L $dylib ; then |