prepare for 'ardour4'

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index ded481c54d90cebaf02f60158e37db37c0882c4d..c0766c066f65f2f7c3755469601bfc157ec470b9 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -167,7 +167,7 @@ ardour_dll_directory ()
 #ifdef PLATFORM_WINDOWS
        std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
        dll_dir_path = Glib::build_filename (dll_dir_path, "lib");
-       return Glib::build_filename (dll_dir_path, "ardour3");
+       return Glib::build_filename (dll_dir_path, LIBARDOUR);
 #else
        std::string s = Glib::getenv("ARDOUR_DLL_PATH");
        if (s.empty()) {
@@ -184,7 +184,7 @@ windows_search_path ()
 {
        std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
        dll_dir_path = Glib::build_filename (dll_dir_path, "share");
-       return Glib::build_filename (dll_dir_path, "ardour3");
+       return Glib::build_filename (dll_dir_path, LIBARDOUR);
 }
 #endif
 

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 748c412312706496996ffe0e3771e6268c94ab0b..c61da5149ba5411ee7641d9d026d56b91ebec5f4 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -371,6 +371,7 @@ def build(bld):
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
+        'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
         'EVORAL_MIDI_XML=1',
         ]
 

diff --git a/libs/fst/wscript b/libs/fst/wscript
index c2afdd71faf51bc16f4eeba7a17d1a12f090ff66..7449d5921d69d4404a0eefd0dd1ca388f94d9527 100644 (file)
--- a/libs/fst/wscript
+++ b/libs/fst/wscript
@@ -83,5 +83,6 @@ def build(bld):
         'USE_WS_PREFIX',
         'VST_SCANNER_APP',
         'PACKAGE="' + I18N_PACKAGE + '"',
+        'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
         ]
     obj.install_path = os.path.join(bld.env['LIBDIR'])

diff --git a/wscript b/wscript
index 3728c3795140adfe195126aa0e50c8512c72ac03..e722e3da5d3da81113a750704a528dfb11544a99 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1049,6 +1049,7 @@ def build(bld):
     bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname)
     bld.env['LIBDIR'] = bld.env['DLLDIR']
     bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale')
+    bld.env['lwrcase_dirname'] = lwrcase_dirname;
 
     autowaf.set_recursive()