install all additional binaries in $libdir

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 344b2ef9b63bf61c01929c410963807ffa637b77..b6100f74b5d647dc2c81906caeedcc8b7c0cf94f 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -116,12 +116,17 @@ PluginManager::PluginManager ()
        string lrdf_path;
 
 #if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+       // source-tree (ardev, etc)
        PBD::Searchpath vstsp(Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst"));
+
 #ifdef PLATFORM_WINDOWS
+       // on windows the .exe needs to be in the same folder with libardour.dll
        vstsp += Glib::build_filename(g_win32_get_package_installation_directory_of_module (0), "bin");
 #else
-       vstsp += Glib::getenv("PATH");
+       // on Unices additional internal-use binaries are deployed to $libdir
+       vstsp += ARDOUR::ardour_dll_directory();
 #endif
+
        if (!PBD::find_file (vstsp,
 #ifdef PLATFORM_WINDOWS
     #ifdef DEBUGGABLE_SCANNER_APP

diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc
index 75b20e4500279411e35b0096345baa12f9287eee..d83165252a913da4b08af75e47e788af0e37e226 100644 (file)
--- a/libs/ardour/system_exec.cc
+++ b/libs/ardour/system_exec.cc
@@ -35,7 +35,10 @@ static char *vfork_exec_wrapper_path() {
 #else
        std::string vfork_exec_wrapper;
        if (!PBD::find_file (
-                               PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork")),
+                               PBD::Searchpath(
+                                       ARDOUR::ardour_dll_directory() // deployed
+                                       + G_SEARCHPATH_SEPARATOR_S + Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork") // src, build (ardev, etc)
+                                       ),
                                "ardour-exec-wrapper", vfork_exec_wrapper)) {
                PBD::fatal << "vfork exec wrapper 'ardour-exec-wrapper' was not found in $PATH." << endmsg;
                /* not reached */

diff --git a/libs/fst/wscript b/libs/fst/wscript
index 91273f3d793b7e02d8ad8947cde201aaa626f8e4..5eb1d512dff0735df12e428226076cc15b138a71 100644 (file)
--- a/libs/fst/wscript
+++ b/libs/fst/wscript
@@ -51,7 +51,7 @@ def build(bld):
         obj.source = 'scanner.wine'
         obj.target = 'ardour-vst-scanner'
         obj.chmod  = Utils.O755
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'fst')
+        obj.install_path = os.path.join(bld.env['LIBDIR'])
         obj.dict   = {
             'VERSION' : bld.env['VERSION'],
                 }
@@ -83,4 +83,4 @@ def build(bld):
         'VST_SCANNER_APP',
         'PACKAGE="' + I18N_PACKAGE + '"',
         ]
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'fst')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])

diff --git a/libs/vfork/wscript b/libs/vfork/wscript
index 10f11149d856dacc5c2b1be40d70ddbfa725a1a3..8f4efbe0c7ecc93e0f1be00fda5a328a1fc329a8 100644 (file)
--- a/libs/vfork/wscript
+++ b/libs/vfork/wscript
@@ -21,7 +21,7 @@ def build(bld):
     obj = bld (features = 'c cprogram')
     obj.source = 'exec_wrapper.c'
     obj.target = 'ardour-exec-wrapper'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'vfork')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])
     obj.defines = [
             '_POSIX_SOURCE',
             '_XOPEN_SOURCE=500',

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 72b7bf389307610a4a552a7666896a6c0c8d9334..2225b2064f15abec66c735a13d91508c6ae5a01b 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -418,7 +418,7 @@ fi
 
 # vfork wrapper
 if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
-    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork
+    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $APPLIB
 fi
 
 # ALSA device reservation tool (if available)

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index ba503d14c7ff40db95d4395c88bbf40ee23ed4ab..3e9f2945a9af2aa5ec07fb8c05e1fc15563f0939 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -110,7 +110,6 @@ ExportFormats=$Shared/export
 Templates=$Shared/templates
 PatchFiles=$Shared/patchfiles
 MackieControl=$Shared/mcp
-VFork=$Frameworks/vfork
 
 if [ x$PRINT_SYSDEPS != x ] ; then
 #
@@ -147,7 +146,6 @@ mkdir -p $Frameworks/modules
 mkdir -p $Etc
 mkdir -p $MackieControl
 mkdir -p $PatchFiles
-mkdir -p $VFork
 
 # maybe set variables
 env=""
@@ -393,13 +391,13 @@ fi
 
 # VST scanner app and wrapper script, if they exist
 if test -d $BUILD_ROOT/libs/fst ; then
-    cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ || true
+    cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/
 fi
 
 # vfork wrapper
 if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
     mkdir -p $Frameworks/vfork
-    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork
+    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $Frameworks/
 fi