From 76dbfc567077fbca09bce2b99a6faa5717bbebba Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 26 Feb 2009 23:24:50 +0000
Subject: [PATCH] Fix running with ard*.sh scripts with waf build.

git-svn-id: svn://localhost/ardour2/branches/3.0@4689 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardbg-waf          | 2 +-
 gtk2_ardour/ardev-waf          | 2 +-
 gtk2_ardour/ardev_common.sh.in | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gtk2_ardour/ardbg-waf b/gtk2_ardour/ardbg-waf
index 6eedeb6f7c..7283d13a89 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
+. `dirname "$0"`/../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-waf b/gtk2_ardour/ardev-waf
index 63509ec9ba..fc06dcbbd8 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
+. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common-waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 exec $EXECUTABLE "$@"
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index f4e0edee74..0cb1b882a4 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -19,9 +19,6 @@ export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
 
-EXECUTABLE=gtk2_ardour/ardour-%VERSION%
-cd `dirname "$0"`/..
-
 #export G_DEBUG=fatal_criticals
 
 libs=@LIBS@