diff options
| -rw-r--r-- | mesonbuild/modules/i18n.py | 3 | ||||
| -rw-r--r-- | test cases/frameworks/6 gettext/data/meson.build | 1 | ||||
| -rw-r--r-- | test cases/frameworks/6 gettext/data2/meson.build | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 98070d7..210dd93 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -175,11 +175,10 @@ class I18nModule(ExtensionModule): command.extend(state.environment.get_build_command()) command.extend([ '--internal', 'msgfmthelper', - '@INPUT@', '@OUTPUT@', kwargs['type'], podir ]) if datadirs: command.append(datadirs) - + command.extend(['@INPUT@', '@OUTPUT@', kwargs['type'], podir]) if kwargs['args']: command.append('--') command.extend(kwargs['args']) diff --git a/test cases/frameworks/6 gettext/data/meson.build b/test cases/frameworks/6 gettext/data/meson.build index 1afb403..698eeec 100644 --- a/test cases/frameworks/6 gettext/data/meson.build +++ b/test cases/frameworks/6 gettext/data/meson.build @@ -4,6 +4,7 @@ i18n.merge_file( output: '@BASENAME@', type: 'desktop', po_dir: '../po', + data_dirs: '../po', install: true, install_dir: join_paths(get_option('datadir'), 'applications') ) diff --git a/test cases/frameworks/6 gettext/data2/meson.build b/test cases/frameworks/6 gettext/data2/meson.build index b8c90a1..9a992c9 100644 --- a/test cases/frameworks/6 gettext/data2/meson.build +++ b/test cases/frameworks/6 gettext/data2/meson.build @@ -3,6 +3,7 @@ i18n.merge_file( output: 'test.plugin', type: 'desktop', po_dir: '../po', + data_dirs: '../po', args: ['--keyword=Description'], install: true, install_dir: join_paths(get_option('datadir'), 'applications') |