correct install location for .mo files (i18n) and cleanup LOCALEDIR use a bit

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index f6d38a92e0cb7d4fc67c763ffe2bac8e5f2b9c2b..c38c8509ab0f84667df23757c91544a2f5ce7abf 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -430,7 +430,7 @@ def build(bld):
         'PACKAGE="' + I18N_PACKAGE + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
-        'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+        'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
         ]
     obj.install_path = bld.env['DLLDIR']
     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
@@ -674,9 +674,8 @@ def build(bld):
         mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
             lang = os.path.basename(mo.srcpath()).replace('.mo', '')
-            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
-                                        lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
-                           mo)
+            bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+                            mo)
 
 def i18n(bld):
     autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index d19f66c0f668fa0526f8b426a8b24870f593637f..bce1b127f49a97e0c15f275b03d94f102aeaa7ed 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -369,7 +369,7 @@ def build(bld):
         'PACKAGE="' + I18N_PACKAGE + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
-        'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+        'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
         'EVORAL_MIDI_XML=1',
         ]
 
@@ -416,8 +416,7 @@ def build(bld):
         mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
             lang = os.path.basename(mo.srcpath()).replace('.mo', '')
-            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
-                                        lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+            bld.install_as(os.path.join(bld.env['LOCALEDIR'], lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
                            mo)
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
@@ -439,8 +438,7 @@ def build(bld):
             'PACKAGE="libardour3test"',
             'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
             'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
-            'LOCALEDIR="' + os.path.join(
-                os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+            'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
             ]
         testcommon.name         = 'testcommon'
 
@@ -519,8 +517,7 @@ def build(bld):
             'PACKAGE="libardour3profile"',
             'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
             'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
-            'LOCALEDIR="' + os.path.join(
-                os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+            'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
             ]
         if bld.env['FPU_OPTIMIZATION']:
             session_load_tester.source += [ 'sse_functions_xmm.cc' ]
@@ -552,8 +549,7 @@ def build(bld):
                 'PACKAGE="libardour3profile"',
                 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
                 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
-                'LOCALEDIR="' + os.path.join(
-                    os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+                'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
                 ]
             if bld.env['FPU_OPTIMIZATION']:
                 profilingobj.source += [ 'sse_functions_xmm.cc' ]
@@ -584,8 +580,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
         'PACKAGE="libardour3test"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
-        'LOCALEDIR="' + os.path.join(
-            os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+        'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
         ]
 
 def shutdown():

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index c385ce01f8fd1c341ab460f1e8e6541b1a096f42..0c06c5f68fa849ac8f8bf36282ba8fcd2f417f11 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -118,10 +118,9 @@ def build(bld):
         mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
             lang = os.path.basename(mo.srcpath()).replace('.mo', '')
-            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
-                                        lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
-                           mo)
-
+            bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+                            mo)
+                           
 def i18n(bld):
     autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
                        'Paul Davis')

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index b12b7bdb44f29d1b612ba283aa5cb2afda39bdf9..ba0b265b990894799a202b71b21e1af4ebfb9941 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -173,6 +173,6 @@ def build(bld):
         testobj.defines      = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
         if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
             testobj.linkflags    = ['-lrt']
-
+            
 def shutdown():
     autowaf.shutdown()

diff --git a/wscript b/wscript
index 9ed505997522bfa83fe8f0b2a2005fd6ca5163d6..1568e0a3b16fd86338f066fb6fd78cd94e77d598 100644 (file)
--- a/wscript
+++ b/wscript
@@ -918,6 +918,7 @@ def build(bld):
     # shared objects loaded at runtime go here (two aliases)
     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')
 
     autowaf.set_recursive()