diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-20 22:36:35 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-20 22:36:35 +0000 |
| commit | b2bf4eee3d9ca63a34415c75e877b8c97d6b5f13 (patch) | |
| tree | c2e3aeec94abfbbd976609bd50559c7a5aca9640 /gtk2_ardour/main.cc | |
| parent | c2e491b8fcadba0da7ab8415a6357cfba88a431d (diff) | |
2.X commits up to and including 7519
git-svn-id: svn://localhost/ardour2/branches/3.0@7661 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index c17d39d2a2..ecb1f23716 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -128,6 +128,15 @@ fixup_bundle_environment () */ path = dir_path; + + /* JACK is often in /usr/local/bin and since Info.plist refuses to + set PATH, we have to force this in order to discover a running + instance of JACK ... + */ + + path += ':'; + path += "/usr/local/bin"; + if (cstr) { path += ':'; path += cstr; @@ -143,7 +152,9 @@ fixup_bundle_environment () setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1); - path = dir_path; + path = user_config_directory.to_string(); + path += ':'; + path += dir_path; path += "/../Resources/icons:"; path += dir_path; path += "/../Resources/pixmaps:"; |