From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Date: Thu, 15 Feb 2018 20:21:58 +0000 (+0100)
Subject: Gettextize policy files
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=aee07273afd4036bbef2461d767b40c8e502fa79;p=elogind.git

Gettextize policy files

* Don't merge translations into the files
* Add gettext-domain="systemd" to description and message

Closes #8162, replaces #8118.
---

diff --git a/src/core/meson.build b/src/core/meson.build
index 62e3f931c..cdbc57d4c 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -196,8 +196,7 @@ libcore_la_sources = files('''
 # 
 # in_files = [['macros.systemd',   rpmmacrosdir],
 #             ['triggers.systemd', ''],
-#             ['systemd.pc',       pkgconfigdatadir],
-#             ['system.conf',      pkgsysconfdir]]
+#             ['systemd.pc',       pkgconfigdatadir]]
 # 
 # foreach item : in_files
 #         file = item[0]
@@ -222,23 +221,17 @@ libcore_la_sources = files('''
 # install_data('org.freedesktop.systemd1.service',
 #              install_dir : dbussystemservicedir)
 # 
-# policy_in = configure_file(
+# policy = 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,
 #         output : 'org.freedesktop.systemd1.policy',
-#         po_dir : po_dir,
-#         data_dirs : po_dir,
-#         install : install_polkit,
-#         install_dir : polkitpolicydir)
 #endif // 0
+        configuration : substs)
+install_data(policy,
+             install_dir : polkitpolicydir)
 
 #if 0 /// totally UNNEEDED in elogind
-# install_data('user.conf',
+# install_data('system.conf',
+#              'user.conf',
 #              install_dir : pkgsysconfdir)
 # 
 # meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
diff --git a/src/login/meson.build b/src/login/meson.build
index bdca39c7f..ed6fb68ef 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -122,14 +122,12 @@ loginctl_sources += files('''
 #         install_data('org.freedesktop.login1.service',
 #                      install_dir : dbussystemservicedir)
 # 
-#         i18n.merge_file(
-#                 'org.freedesktop.login1.policy',
+#         policy = configure_file(
 #                 input : 'org.freedesktop.login1.policy.in',
 #                 output : 'org.freedesktop.login1.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('70-power-switch.rules', install_dir : udevrulesdir)
 #