From cb3803433491abfe7c58742dbe7801591b21694a Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 13 Nov 2014 19:57:40 +0100
Subject: install all additional binaries in $libdir

---
 libs/ardour/system_exec.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libs/ardour/system_exec.cc')

diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc
index 75b20e4500..d83165252a 100644
--- 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 */
-- 
cgit v1.2.3