From 2b745cab644e41860175e2bb4e21bcb190610223 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 10 Jun 2013 22:24:19 +0200 Subject: [PATCH] set PATH (used for harvid+ffmpeg) --- gtk2_ardour/main.cc | 4 ++++ tools/linux_packaging/ardour.sh.in | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index d147b48fa5..21e5343979 100644 --- 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 33dfc45515..6545e80b40 100644 --- 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 -- 2.30.2