2.X commits up to and including 7519

git-svn-id: svn://localhost/ardour2/branches/3.0@7661 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-08-20 22:36:35 +00:00
parent c2e491b8fc
commit b2bf4eee3d
12 changed files with 107 additions and 13 deletions

View file

@ -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:";