diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2014-06-03 22:27:36 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2014-06-07 13:49:11 +1000 |
| commit | 7ba3e50e51ee09a22bc133bf156014331ee8002d (patch) | |
| tree | 980a22291b1edebf8bf183b17f0336393b99d9c3 /gtk2_ardour/ardour.sh.in | |
| parent | cd57e14cf3c3fe759916e16f6023a1430a1ff75c (diff) | |
Fix paths in ardour.sh
Diffstat (limited to 'gtk2_ardour/ardour.sh.in')
| -rw-r--r-- | gtk2_ardour/ardour.sh.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index 04a9585b64..16061f5c09 100644 --- a/gtk2_ardour/ardour.sh.in +++ b/gtk2_ardour/ardour.sh.in @@ -5,9 +5,9 @@ # and does a few checks before exec'ing the real executable. # -export GTK_PATH=@SYSCONFDIR@/ardour3:@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH} +export GTK_PATH=@CONFDIR@:@LIBDIR@${GTK_PATH:+:$GTK_PATH} -export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=@LIBDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ## Memlock check @@ -23,7 +23,7 @@ fi ## Glib atomic test -GLIB=$(ldd @LIBDIR@/ardour3/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/') +GLIB=$(ldd @LIBDIR@/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." @@ -43,15 +43,15 @@ fi # Running Ardour requires these 3 variables to be set # -export ARDOUR_DATA_PATH=@DATADIR@/ardour3 -export ARDOUR_CONFIG_PATH=@SYSCONFDIR@/ardour3 -export ARDOUR_DLL_PATH=@LIBDIR@/ardour3 +export ARDOUR_DATA_PATH=@DATADIR@ +export ARDOUR_CONFIG_PATH=@CONFDIR@ +export ARDOUR_DLL_PATH=@LIBDIR@ # # VAMP has its own lookup path # -export VAMP_PATH=@LIBDIR@/ardour3/vamp +export VAMP_PATH=@LIBDIR@/vamp if [ $# -gt 0 ] ; then case $1 in @@ -59,6 +59,6 @@ if [ $# -gt 0 ] ; then esac fi -exec $GDB @LIBDIR@/ardour3/ardour-@VERSION@ "$@" +exec $GDB @LIBDIR@/ardour-@VERSION@ "$@" |