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

1 files changed, 2 insertions, 6 deletions

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 887ca5453c..a3ee38e629 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -202,13 +202,9 @@ load_rc_file (const string& filename, bool themechange)
 {
 	sys::path rc_file_path;
 
-	SearchPath spath (ardour_search_path());
-	spath += user_config_directory();
-	spath += system_config_search_path();
-
-	if (!find_file_in_search_path (spath, filename, rc_file_path)) {
+	if (!find_file_in_search_path (ardour_config_search_path(), filename, rc_file_path)) {
 		warning << string_compose (_("Unable to find UI style file %1 in search path %2. %3 will look strange"),
-                                           filename, spath.to_string(), PROGRAM_NAME)
+                                           filename, ardour_config_search_path().to_string(), PROGRAM_NAME)
 				<< endmsg;
 		return;
 	}