fix ardvst and ardourvst (use variable or version number)

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 0d802dfab5dcedf862074b11a9f13e184f67d5e4..897bfcf7c216e39ebf791b11dbc0bcc686a0f927 100644 (file)
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -34,4 +34,5 @@ export LD_LIBRARY_PATH=$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
 
+ARDOURVERSION=@VERSION@
 EXECUTABLE=@EXECUTABLE@

diff --git a/vst/ardevst b/vst/ardevst
index f3db3170b7897d709b3858bd20fd62c8876a8684..f88b1744455e29830c270441331ad1ebd8af44b0 100755 (executable)
--- a/vst/ardevst
+++ b/vst/ardevst
@@ -2,4 +2,4 @@
 
 . `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
 export LD_LIBRARY_PATH=$libs/../gtk2_ardour:$LD_LIBRARY_PATH
-exec wine $libs/../gtk2_ardour/ardour-3.0-vst.exe.so "$@"
+exec wine $libs/../gtk2_ardour/ardour-$ARDOURVERSION-vst.exe.so "$@"

diff --git a/vst/ardourvst.in b/vst/ardourvst.in
index 2a5b811785e1e3be8c6beb9a3181e8672314b14f..1a3b82f4a37794d67040804d18b3c1c7e30e89d4 100644 (file)
--- a/vst/ardourvst.in
+++ b/vst/ardourvst.in
@@ -11,6 +11,6 @@ export ARDOUR_DLL_PATH=@LIBDIR@/ardour3
 export GTK_PATH=@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH}
 export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
-exec wine @LIBDIR@/ardour3/ardour-3.0-vst.exe.so "$@"
+exec wine @LIBDIR@/ardour3/ardour-@VERSION@-vst.exe.so "$@"