From 813c5f0af9d1dac32b156ef3c72b890a7cf9eab5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 18 May 2012 17:24:06 +0000 Subject: major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things. This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required) git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/actions.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gtk2_ardour/actions.cc') diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index e9252bcbff..a1bdcdb36e 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -72,9 +72,7 @@ ActionManager::init () ui_manager = UIManager::create (); - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); - - find_file_in_search_path (spath, "ardour.menus", ui_file); + find_file_in_search_path (ardour_config_search_path(), "ardour.menus", ui_file); bool loaded = false; -- cgit v1.2.3