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, 1 insertions, 8 deletions

diff --git a/wscript b/wscript
index f019091a2d..20a88dbd1e 100644
--- a/wscript
+++ b/wscript
@@ -35,6 +35,7 @@ children = [
         'templates',
         'export',
         'midi_maps',
+        'mcp',
         'manual'
 ]
 
@@ -737,11 +738,3 @@ def i18n_po(bld):
 def i18n_mo(bld):
     bld.recurse (i18n_children)
 
-def install_not_supported(bld):
-    print ('Installing Ardour 3 is currently unsupported. Run it via the command ./ardev from within the gtk2_ardour directory.')
-    sys.exit (1)
-
-from waflib import Build
-class install(Build.InstallContext):
-    cmd = 'install'
-    fun = 'install_not_supported'