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, 12 insertions, 5 deletions

diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
index e183193cb0..120ae25f97 100644
--- a/libs/ardour/ardour/filesystem_paths.h
+++ b/libs/ardour/ardour/filesystem_paths.h
@@ -35,13 +35,20 @@ namespace ARDOUR {
 	 * @return the path to the directory that contains the system wide ardour
 	 * modules.
 	 */
-	PBD::sys::path ardour_module_directory ();
+	PBD::sys::path ardour_dll_directory ();
 
-	PBD::SearchPath ardour_search_path ();
-
-	PBD::SearchPath system_config_search_path ();
+	/**
+	 * @return the search path to be used when looking for per-system
+	 * configuration files. This may include user configuration files.
+	 */
+	PBD::SearchPath ardour_config_search_path ();
 
-	PBD::SearchPath system_data_search_path ();
+	/**
+	 * @return the search path to be used when looking for data files
+	 * that could be shared by systems (h/w and configuration independent
+	 * files, such as icons, XML files, etc)
+	 */
+	PBD::SearchPath ardour_data_search_path ();
 
 } // namespace ARDOUR