commit f958837964784315c1dc633f41f1ef5d2a17aea9
author Dylan Baker <dylan@pnwbakers.com> Fri Aug 24 07:05:36 2018 -0700
committer Andres Gomez <agomez@igalia.com> Wed Aug 29 17:19:28 2018 +0300
tree 5a8ff355548273d99e9b81d3a26b95fa6f4f4365
parent baf5c4e4dfdab68db0fd91e420fc604d46384d61

meson: Actually load translation files

Currently we run the script but don't actually load any files, even in a
tarball where they exist.

Fixes: 3218056e0eb375eeda470058d06add1532acd6d4
       ("meson: Build i965 and dri stack")
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
(cherry picked from commit 7c00db9527245d80cb748ec3442163585a5463a6)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez@igalia.com>

Conflicts:
	src/util/xmlpool/meson.build

src/util/xmlpool/meson.build

diff --git a/src/util/xmlpool/meson.build b/src/util/xmlpool/meson.build
index 97693fa..69625fc 100644
--- a/src/util/xmlpool/meson.build
+++ b/src/util/xmlpool/meson.build
@@ -22,7 +22,10 @@
   'xmlpool_options.h',
   input : ['gen_xmlpool.py', 't_options.h'],
   output : 'options.h',
-  command : [prog_python2, '@INPUT@', meson.current_source_dir()],
+  command : [
+    prog_python2, '@INPUT@', meson.current_source_dir(),
+    'ca', 'es', 'de', 'nl', 'sv', 'fr',
+  ],
   capture : true,
   depend_files : files('ca.po', 'es.po', 'de.po', 'nl.po', 'sv.po', 'fr.po'),
 )