diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-10-02 23:17:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-10-02 23:17:59 +0000 |
| commit | 897f29e33cf20c1320a34f7e5e888fee634c4378 (patch) | |
| tree | 16fe1e43781bd4f8816904785bf36a3982fa9dc0 /gtk2_ardour/ardour.sh.in | |
| parent | 428e5ae18a33d2d81d930d7ed41f42c68f0e5741 (diff) | |
@LIBDIR@ apparently now includes @INSTALL_PREFIX@, so just use that on its own (#4344).
git-svn-id: svn://localhost/ardour2/branches/3.0@10183 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour.sh.in')
| -rw-r--r-- | gtk2_ardour/ardour.sh.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index 63768e7344..d7297fd77c 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:+:$GTK_PATH} +export GTK_PATH=@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH} -export LD_LIBRARY_PATH=@INSTALL_PREFIX@/@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$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 @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,6 +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@ "$@" +exec @LIBDIR@/ardour3/ardour-@VERSION@ "$@" |