diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-18 17:24:06 +0000 |
| commit | 813c5f0af9d1dac32b156ef3c72b890a7cf9eab5 (patch) | |
| tree | 29aa92a68feb1557c60500969d6d5aeade6a2e9b /libs/ardour/rc_configuration.cc | |
| parent | 433b6651ee8450da8282330ac35cb7ec1abbab6f (diff) | |
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
Diffstat (limited to 'libs/ardour/rc_configuration.cc')
| -rw-r--r-- | libs/ardour/rc_configuration.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index d5bfc7a9a8..1adde47b2a 100644 --- a/libs/ardour/rc_configuration.cc +++ b/libs/ardour/rc_configuration.cc @@ -84,7 +84,7 @@ RCConfiguration::load_state () /* load system configuration first */ - if (find_file_in_search_path (ardour_search_path() + system_config_search_path(), "ardour_system.rc", system_rc_file)) { + if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", system_rc_file)) { string rcfile = system_rc_file.to_string(); /* stupid XML Parser hates empty files */ @@ -115,7 +115,7 @@ RCConfiguration::load_state () sys::path user_rc_file; - if (find_file_in_search_path (ardour_search_path() + user_config_directory(), "ardour.rc", user_rc_file)) { + if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", user_rc_file)) { string rcfile = user_rc_file.to_string(); /* stupid XML parser hates empty files */ |