From: Michael Biebl <mbiebl@gmail.com>
Date: Sun, 18 Feb 2018 18:56:50 +0000 (+0100)
Subject: Merge pull request #8202 from keszybz/avoid-msgmerge
X-Git-Tag: v238~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba3182b91a748334b20236bcda5adfcbb749f493;p=thirdparty%2Fsystemd.git

Merge pull request #8202 from keszybz/avoid-msgmerge

Replace msgmerge use by gettext-domain= references
---

ba3182b91a748334b20236bcda5adfcbb749f493
diff --cc src/core/meson.build
index a89a12232dd,01706dbf294..3fc43f63353
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@@ -212,21 -211,15 +212,14 @@@ install_data('org.freedesktop.systemd1.
  install_data('org.freedesktop.systemd1.service',
               install_dir : dbussystemservicedir)
  
- policy_in = configure_file(
-         input : 'org.freedesktop.systemd1.policy.in.in',
-         output : 'org.freedesktop.systemd1.policy.in',
-         configuration : substs)
- 
- i18n.merge_file(
-         'org.freedesktop.systemd1.policy',
-         input : policy_in,
+ policy = configure_file(
+         input : 'org.freedesktop.systemd1.policy.in',
          output : 'org.freedesktop.systemd1.policy',
-         po_dir : po_dir,
-         data_dirs : po_dir,
-         install : install_polkit,
-         install_dir : polkitpolicydir)
+         configuration : substs)
+ install_data(policy,
+              install_dir : polkitpolicydir)
  
 -install_data('system.conf',
 -             'user.conf',
 +install_data('user.conf',
               install_dir : pkgsysconfdir)
  
  meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))