Now that we have dropped prefixes from the file, it no longer needs to go through configure_file() and we can use it directly. Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> --- build-aux/syntax-check.mk | 6 +++--- po/{POTFILES.in => POTFILES} | 0 po/meson.build | 13 +------------ 3 files changed, 4 insertions(+), 15 deletions(-) rename po/{POTFILES.in => POTFILES} (100%) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 92969fb720..35c819ff98 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1476,10 +1476,10 @@ perl_translatable_files_list_ = \ -e '}' # Verify that all source files using _() (more specifically, files that -# match $(_gl_translatable_string_re)) are listed in po/POTFILES.in. -po_file ?= $(top_srcdir)/po/POTFILES.in +# match $(_gl_translatable_string_re)) are listed in po/POTFILES. +po_file ?= $(top_srcdir)/po/POTFILES -# List of additional files that we want to pick up in our POTFILES.in +# List of additional files that we want to pick up in our POTFILES # This is all generated files for RPC code. generated_files = \ $(top_builddir)/src/*.[ch] \ diff --git a/po/POTFILES.in b/po/POTFILES similarity index 100% rename from po/POTFILES.in rename to po/POTFILES diff --git a/po/meson.build b/po/meson.build index d13466bc06..f5d05e2b31 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,16 +1,5 @@ i18n = import('i18n') -potfiles_conf = configuration_data({ - 'SRCDIR': '', - 'BUILDDIR': '', -}) - -potfiles = configure_file( - input: 'POTFILES.in', - output: '@BASENAME@', - configuration: potfiles_conf, -) - i18n.gettext( meson.project_name(), args: [ @@ -20,7 +9,7 @@ i18n.gettext( '--add-comments=TRANSLATORS:', '--directory=@0@'.format(meson.source_root()), '--directory=@0@'.format(meson.build_root()), - '--files-from=@0@'.format(meson.current_build_dir() / 'POTFILES'), + '--files-from=@0@'.format(meson.current_source_dir() / 'POTFILES'), '--msgid-bugs-address=https://libvirt.org/bugs.html', '--package-version=@0@'.format(meson.project_version()), '--sort-output', -- 2.35.3