diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-09 08:19:11 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-09 08:19:11 -0500 |
commit | 246a4f3018db6a7650ff60dda9562b7cb9891331 (patch) | |
tree | 024db45f9df9f9e1793f0d79833a8be4f519f3a6 /libs | |
parent | 1648b94905c2a03b82083c767064957c3f347908 (diff) |
correct install location for .mo files (i18n) and cleanup LOCALEDIR use a bit
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/wscript | 17 | ||||
-rw-r--r-- | libs/gtkmm2ext/wscript | 7 | ||||
-rw-r--r-- | libs/pbd/wscript | 2 |
3 files changed, 10 insertions, 16 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index d19f66c0f6..bce1b127f4 100644 --- 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 c385ce01f8..0c06c5f68f 100644 --- 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 b12b7bdb44..ba0b265b99 100644 --- 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() |