One fix.

[ardour.git] / libs / ardour / system_exec.cc

diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc
index 75b20e4500279411e35b0096345baa12f9287eee..aec89564223511a08834ca51b2e180850d16e010 100644 (file)
--- a/libs/ardour/system_exec.cc
+++ b/libs/ardour/system_exec.cc
@@ -25,7 +25,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/system_exec.h"
 
-using namespace ARDOUR;
+namespace ARDOUR {
 
 char * SystemExec::_vfork_exec_wrapper = NULL;
 
@@ -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
@@ -76,3 +78,5 @@ SystemExec::SystemExec (std::string c, const std::map<char, std::string> subs)
 }
 
 SystemExec::~SystemExec() { }
+
+} // namespace ARDOUR