po: Don't generate POTFILES

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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 92969fb720c52f650f8d8af5b90038ae0c36d7ee..35c819ff98a91218294a897287f3924786cf8f51 100644 (file)
--- 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 d13466bc0677de5fc318bdc1d48aa50c19dee44e..f5d05e2b31c401d54e6f70ec045ce02ce5682306 100644 (file)
--- 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',