Mesa (staging/18.2): meson: Actually load translation files

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: f958837964784315c1dc633f41f1ef5d2a17aea9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f958837964784315c1dc633f41f1ef5d2a17aea9

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Fri Aug 24 07:05:36 2018 -0700

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 at intel.com>
(cherry picked from commit 7c00db9527245d80cb748ec3442163585a5463a6)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez at igalia.com>

Conflicts:
	src/util/xmlpool/meson.build

---

 src/util/xmlpool/meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/util/xmlpool/meson.build b/src/util/xmlpool/meson.build
index 97693fac8c..69625fc2c1 100644
--- a/src/util/xmlpool/meson.build
+++ b/src/util/xmlpool/meson.build
@@ -22,7 +22,10 @@ xmlpool_options_h = custom_target(
   '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'),
 )