X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsystem_exec.cc;h=b85b2347aebb76d9e8001f1a76d4914bc0dbb195;hb=5186c69bac29e7b5c542ec98ccf1fb9a7fdac8ea;hp=75b20e4500279411e35b0096345baa12f9287eee;hpb=5424119b559fc6f68ca0d85c22a4866739c2ab73;p=ardour.git

diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc
index 75b20e4500..b85b2347ae 100644
--- a/libs/ardour/system_exec.cc
+++ b/libs/ardour/system_exec.cc
@@ -35,11 +35,13 @@ 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 */
-		return NULL;
+		abort(); /*NOTREACHED*/
 	}
 	return strdup(vfork_exec_wrapper.c_str());
 #endif