diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-02-26 22:30:13 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-02-26 22:30:13 +0000 |
| commit | c841bb76dda077cc14ec9acdddaaf83de70c0b60 (patch) | |
| tree | ea12272a04c01ea54ac582a52dfd787cf2c97ce4 /gtk2_ardour/ardour.sh.in | |
| parent | e36424f008f80766718cc9e563becaf90b17b76c (diff) | |
unify ard* scripts for both scons & waf builds
git-svn-id: svn://localhost/ardour2/branches/3.0@4688 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour.sh.in')
| -rw-r--r-- | gtk2_ardour/ardour.sh.in | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index 989af5e618..a08661785d 100644 --- a/gtk2_ardour/ardour.sh.in +++ b/gtk2_ardour/ardour.sh.in @@ -1,8 +1,8 @@ #!/bin/sh -export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour3:$GTK_PATH +export GTK_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3:$GTK_PATH -export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour3:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3:$LD_LIBRARY_PATH # DYLD_LIBRARY_PATH is for Darwin export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH @@ -20,7 +20,7 @@ fi ## Glib atomic test -GLIB=$(ldd %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/') +GLIB=$(ldd @INSTALL_PREFIX@/@LIBDIR@/ardour3/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/') if [ "$GLIB" = "" ]; then echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations." @@ -36,26 +36,6 @@ elif [ $(nm -D --radix=dec --defined-only -S $GLIB | grep -w g_atomic_int_add | echo "" fi -exec %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% "$@" - -## Glib atomic test - -GLIB=$(ldd %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/') - -if [ "$GLIB" = "" ]; then - echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations." - echo "" -elif [ $(nm -D --radix=dec --defined-only -S $GLIB | grep -w g_atomic_int_add | cut -d ' ' -f 2) -gt 32 ]; then - echo "WARNING: Your system contains a suspect libglib-2.0. Your version might be built" - echo " to use mutex locking atomic operations. This is a fallback solution to" - echo " a more robust hardware supported atomicity. It might cause reduced " - echo " performance and/or deadlocks. Please contact your distribution support" - echo " about this issue." - echo " Unfortunately this check is not 100% accurate, so this might not be" - echo " the case with your system." - echo "" -fi - -exec %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% "$@" +exec @INSTALL_PREFIX@/@LIBDIR@/ardour3/ardour-@VERSION@ "$@" |