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/midi_patch_search_path.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/midi_patch_search_path.cc')
| -rw-r--r-- | libs/ardour/midi_patch_search_path.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/midi_patch_search_path.cc b/libs/ardour/midi_patch_search_path.cc index 50f83d852e..3f83375c96 100644 --- a/libs/ardour/midi_patch_search_path.cc +++ b/libs/ardour/midi_patch_search_path.cc @@ -36,7 +36,7 @@ midi_patch_search_path () { SearchPath spath (user_config_directory ()); - spath += ardour_module_directory (); + spath += ardour_dll_directory (); spath.add_subdirectory_to_paths(midi_patch_dir_name); bool midi_patch_path_defined = false; |