diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
| commit | 3be16e8afbd891c0bfe7227158384ed0d127597f (patch) | |
| tree | 73a8f761fc13cbd0613d3923a34748bb9aa761d2 /gtk2_ardour/main.cc | |
| parent | a9bb336fc44ab4937978f5a0308e440ed632ea50 (diff) | |
partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index edbdcd58cb..aecbc1f634 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -117,7 +117,10 @@ fixup_bundle_environment () Glib::ustring path; const char *cstr = getenv ("PATH"); - /* ensure that we find any bundled executables (e.g. JACK) */ + /* ensure that we find any bundled executables (e.g. JACK), + and find them before any instances of the same name + elsewhere in PATH + */ path = dir_path; if (cstr) { @@ -152,8 +155,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Plugins"; setenv ("LADSPA_PATH", path.c_str(), 1); @@ -162,8 +167,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Frameworks"; setenv ("VAMP_PATH", path.c_str(), 1); @@ -172,8 +179,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Surfaces"; setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1); @@ -182,8 +191,10 @@ fixup_bundle_environment () if (cstr) { path = cstr; path += ':'; + } else { + path = ""; } - path = dir_path; + path += dir_path; path += "/../Plugins"; setenv ("LV2_PATH", path.c_str(), 1); |