set PATH (used for harvid+ffmpeg)

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index d147b48fa5e07e95607e530c036faa5e20496bd3..21e534397976b39930a1e02fd8c7f3fb2dc21a55 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -184,6 +184,8 @@ fixup_bundle_environment (int, char* [])
        export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
        export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
 
+       setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
+
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
 
@@ -292,6 +294,8 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
        export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
        export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
 
+       setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
+
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
 

diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in
index 33dfc45515985fa6336c39fc9f7be59e858a96cd..6545e80b405c35d54069a17f9ba2a3480f73a64a 100644 (file)
--- a/tools/linux_packaging/ardour.sh.in
+++ b/tools/linux_packaging/ardour.sh.in
@@ -31,9 +31,6 @@ if [ ! -d $USER_ARDOUR_DIR ] ; then
     mkdir -p $USER_ARDOUR_DIR || exit 1
 fi
 
-PATH="${BIN_DIR}:${PATH}"
-export PATH
-
 # this triggers code in main() that will reset runtime environment variables
 # to point to directories inside the ardour package