fix vamp path:

* append, not replace
* make it work on wine/ardour

diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 48df5a978c28bc8ce4efaded9908690890efcb7f..8bcad1bf6ef08632e0f6576885f35001c731806d 100644 (file)
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -57,7 +57,7 @@ export ARDOUR_SELF="$0"
 # VAMP has its own lookup path
 # 
 
-export VAMP_PATH=@LIBDIR@/vamp
+export VAMP_PATH=@LIBDIR@/vamp${VAMP_PATH:+:$VAMP_PATH}
 
 if [ $# -gt 0 ] ; then
     case $1 in

diff --git a/vst/ardourvst.in b/vst/ardourvst.in
index 9cf88073dd61e8b3a906c174f3e29d4ce5d2d79e..639acb4b3f7b9e29d09b1187a17f3cdc987eff5f 100644 (file)
--- a/vst/ardourvst.in
+++ b/vst/ardourvst.in
@@ -1,13 +1,14 @@
 #!/bin/sh
 
 #
-# Running Ardour requires these 3 variables to be set
+# Running Ardour requires these variables to be set
 #
 
 export ARDOUR_DATA_PATH=@DATADIR@
 export ARDOUR_CONFIG_PATH=@CONFDIR@
 export ARDOUR_DLL_PATH=@LIBDIR@
 
+export VAMP_PATH=@LIBDIR@/vamp${VAMP_PATH:+:$VAMP_PATH}
 export GTK_PATH=@LIBDIR@${GTK_PATH:+:$GTK_PATH}
 export LD_LIBRARY_PATH=@LIBDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
@@ -15,5 +16,3 @@ export LD_LIBRARY_PATH=@LIBDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export ARDOUR_SELF="$0"
 
 exec wine @LIBDIR@/ardour-@VERSION@-vst.exe.so "$@"
-
-