diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
| commit | d135c4dc3a307d0be606f3afbbc8fd8c3ec56438 (patch) | |
| tree | dbedf6ddfe1c1b6557a885ad3b87455ba2213a12 /gtk2_ardour/main.cc | |
| parent | fb313fb1741a04f270fff3703967df572ac4fc45 (diff) | |
| parent | 75271a17d8d4ed0003c4627e80a28feb68f5d9c9 (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index da2677b296..70472e7f7e 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -154,7 +154,7 @@ fixup_bundle_environment (int, char* []) vector<string> lpath; lpath.push_back (bundle_dir); - lpath.push_back ("share"); + lpath.push_back ("Resources"); lpath.push_back ("locale"); localedir = strdup (Glib::build_filename (lpath).c_str()); } @@ -173,10 +173,10 @@ fixup_bundle_environment (int, char* []) export_search_path (bundle_dir, "ARDOUR_INSTANT_XML_PATH", "/Resources"); export_search_path (bundle_dir, "LADSPA_PATH", "/Plugins"); export_search_path (bundle_dir, "VAMP_PATH", "/lib"); - export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib"); export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines"); - g_setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1); + g_setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1); + g_setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(g_getenv ("PATH"))).c_str(), 1); /* unset GTK_RC_FILES so that we only load the RC files that we define */ @@ -283,10 +283,10 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) export_search_path (dir_path, "ARDOUR_DATA_PATH", "/share"); export_search_path (dir_path, "LADSPA_PATH", "/plugins"); export_search_path (dir_path, "VAMP_PATH", "/lib"); - export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib"); export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines"); - g_setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1); + g_setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1); + g_setenv ("PATH", (dir_path + "/bin:" + std::string(g_getenv ("PATH"))).c_str(), 1); /* unset GTK_RC_FILES so that we only load the RC files that we define */ |