diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 2 | ||||
| -rwxr-xr-x | gtk2_ardour/ardbg | 3 | ||||
| -rwxr-xr-x | gtk2_ardour/ardbg-waf | 2 | ||||
| -rwxr-xr-x | gtk2_ardour/ardev | 4 | ||||
| -rwxr-xr-x | gtk2_ardour/ardev-waf | 4 | ||||
| -rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 8 | ||||
| -rwxr-xr-x | gtk2_ardour/arval | 2 | ||||
| -rw-r--r-- | gtk2_ardour/arval-waf | 4 |
8 files changed, 16 insertions, 13 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 6939626fca..0a9d852b2c 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -472,7 +472,7 @@ my_subst_dict['@INSTALL_PREFIX@'] = final_prefix my_subst_dict['@LIBDIR@'] = env['LIBDIR'] my_subst_dict['@LIBS@'] = 'libs' my_subst_dict['@VERSION@'] = ardour_version -my_subst_dict['@EXECUTABLE@'] = 'ardour-' + ardour_version +my_subst_dict['@EXECUTABLE@'] = 'gtk2_ardour/ardour-' + ardour_version ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict); env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755)) diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg index e7f73c3636..4ffa3cda6e 100755 --- a/gtk2_ardour/ardbg +++ b/gtk2_ardour/ardbg @@ -1,6 +1,5 @@ #!/bin/sh -dir=`dirname "$0"` -. $dir/ardev_common.sh +. ./ardev_common.sh LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH export ARDOUR_INSIDE_GDB=1 exec gdb --args $EXECUTABLE "$@" diff --git a/gtk2_ardour/ardbg-waf b/gtk2_ardour/ardbg-waf index 595b507c69..a2139baccb 100755 --- a/gtk2_ardour/ardbg-waf +++ b/gtk2_ardour/ardbg-waf @@ -1,5 +1,5 @@ #!/bin/sh -. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh +. ../build/default/gtk2_ardour/ardev_common_waf.sh LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH export ARDOUR_INSIDE_GDB=1 exec gdb --args $EXECUTABLE "$@" diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev index 7980c43d93..81af10126f 100755 --- a/gtk2_ardour/ardev +++ b/gtk2_ardour/ardev @@ -1,4 +1,4 @@ #!/bin/sh -. `dirname "$0"`/ardev_common.sh +. ./ardev_common.sh LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH -exec $EXECUTABLE "$@" +exec $TOP/$EXECUTABLE "$@" diff --git a/gtk2_ardour/ardev-waf b/gtk2_ardour/ardev-waf index ae7453ff65..2e43f0e7f2 100755 --- a/gtk2_ardour/ardev-waf +++ b/gtk2_ardour/ardev-waf @@ -1,4 +1,4 @@ #!/bin/sh -. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh +. ../build/default/gtk2_ardour/ardev_common_waf.sh LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH -exec $EXECUTABLE "$@" +exec $TOP/$EXECUTABLE "$@" diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 2914e070e8..7a3ad5d46a 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -1,12 +1,12 @@ -cd `dirname "$0"`/.. +TOP=.. #export G_DEBUG=fatal_criticals -libs=@LIBS@ +libs=$TOP/@LIBS@ -export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:build/default/gtk2_ardour:. +export ARDOUR_PATH=$TOP/gtk2_ardour/icons:$TOP/gtk2_ardour/pixmaps:$TOP/gtk2_ardour:$TOP/build/default/gtk2_ardour:. export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate -export ARDOUR_DATA_PATH=gtk2_ardour:build/default/gtk2_ardour:. +export ARDOUR_DATA_PATH=$TOP/gtk2_ardour:build/default/gtk2_ardour:. if test -d $HOME/gtk/inst ; then echo USING NEW CLEARLOOKS diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval index 7267857348..f3054ef4ef 100755 --- a/gtk2_ardour/arval +++ b/gtk2_ardour/arval @@ -1,4 +1,4 @@ #!/bin/sh -. `dirname "$0"`/ardev_common.sh +. ./ardev_common.sh export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE exec valgrind --num-callers=50 --tool=memcheck $EXECUTABLE --novst "$@" diff --git a/gtk2_ardour/arval-waf b/gtk2_ardour/arval-waf new file mode 100644 index 0000000000..13ae0bd028 --- /dev/null +++ b/gtk2_ardour/arval-waf @@ -0,0 +1,4 @@ +#!/bin/sh +. ../build/default/gtk2_ardour/ardev_common_waf.sh +export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE +exec valgrind --num-callers=50 --tool=memcheck $EXECUTABLE --novst "$@" |