- Fixed templates install directory to <prefix>/share/ardour2

- Added system templates dir bookmark to NSD

git-svn-id: svn://localhost/ardour2/trunk@603 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index 88944aacb7172b55b93d0d56b565e96a18545895..8889b9cd625f8a558af3c900e1a917c093933de9 100644 (file)
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -302,6 +302,7 @@ NewSessionDialog::NewSessionDialog()
        if (!path.empty()) {
                m_template->set_current_folder (path + X_("templates/"));
        }
+       m_template->add_shortcut_folder(ARDOUR::get_system_data_path() + X_("templates"));
        m_template->set_title(_("select template"));
        Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
        session_filter->add_pattern(X_("*.ardour"));

diff --git a/templates/SConscript b/templates/SConscript
index b5410ad7a5caa637b9d307731f0680ef9dacc6e7..7fa556530b1e083a53a84211d33ed5ef484bf117 100644 (file)
--- a/templates/SConscript
+++ b/templates/SConscript
@@ -13,5 +13,5 @@ for template in template_files:
 
 Default(template_build)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour/templates'), template_build))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/templates'), template_build))
 env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + template_build))