meson: drop unnecessary "transformation" of policy files

Those files don't contain any @variables@, so the configuration step was just
copying them to build/. Let's avoid that, and fix their suffixes while at it.

diff --git a/src/hostname/meson.build b/src/hostname/meson.build
index c35c6688ba24a541270421d43c1ec50cbe7521a4..1ab9271b4c6ab03f1fc5051ffcae47d80fec3e89 100644 (file)
--- a/src/hostname/meson.build
+++ b/src/hostname/meson.build
@@ -20,11 +20,6 @@ if conf.get('ENABLE_HOSTNAMED') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.hostname1.service',
                      install_dir : dbussystemservicedir)
-
-        policy = configure_file(
-                input : 'org.freedesktop.hostname1.policy.in',
-                output : 'org.freedesktop.hostname1.policy',
-                configuration : substs)
-        install_data(policy,
+        install_data('org.freedesktop.hostname1.policy',
                      install_dir : polkitpolicydir)
 endif

diff --git a/src/hostname/org.freedesktop.hostname1.policy.in b/src/hostname/org.freedesktop.hostname1.policy
similarity index 100%
rename from src/hostname/org.freedesktop.hostname1.policy.in
rename to src/hostname/org.freedesktop.hostname1.policy

diff --git a/src/import/meson.build b/src/import/meson.build
index e5088b343406fc91fb6ccf4eb0770d4c95533df9..975afc624d8965e93b8a0ee7c03801781512fb6d 100644 (file)
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -70,12 +70,7 @@ if conf.get('ENABLE_IMPORTD') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.import1.service',
                      install_dir : dbussystemservicedir)
-
-        policy = configure_file(
-                input : 'org.freedesktop.import1.policy.in',
-                output : 'org.freedesktop.import1.policy',
-                configuration : substs)
-        install_data(policy,
+        install_data('org.freedesktop.import1.policy',
                      install_dir : polkitpolicydir)
 
         install_data('import-pubring.gpg',

diff --git a/src/import/org.freedesktop.import1.policy.in b/src/import/org.freedesktop.import1.policy
similarity index 100%
rename from src/import/org.freedesktop.import1.policy.in
rename to src/import/org.freedesktop.import1.policy

diff --git a/src/locale/meson.build b/src/locale/meson.build
index 30882cc0274e4a179cae2129841c91812e9487f0..6b85f6bea6f0de733db062a7e346d210baa43132 100644 (file)
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -28,12 +28,7 @@ if conf.get('ENABLE_LOCALED') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.locale1.service',
                      install_dir : dbussystemservicedir)
-
-        policy = configure_file(
-                input : 'org.freedesktop.locale1.policy.in',
-                output : 'org.freedesktop.locale1.policy',
-                configuration : substs)
-        install_data(policy,
+        install_data('org.freedesktop.locale1.policy',
                      install_dir : polkitpolicydir)
 endif
 

diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy
similarity index 100%
rename from src/locale/org.freedesktop.locale1.policy.in
rename to src/locale/org.freedesktop.locale1.policy

diff --git a/src/login/meson.build b/src/login/meson.build
index 599c44ea971c7335cf881a65bdb2f3e1191a0554..5b75382e5f954faf41136975e1a4d630326b8a6e 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -87,12 +87,7 @@ if conf.get('ENABLE_LOGIND') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.login1.service',
                      install_dir : dbussystemservicedir)
-
-        policy = configure_file(
-                input : 'org.freedesktop.login1.policy.in',
-                output : 'org.freedesktop.login1.policy',
-                configuration : substs)
-        install_data(policy,
+        install_data('org.freedesktop.login1.policy',
                      install_dir : polkitpolicydir)
 
         install_data('70-power-switch.rules', install_dir : udevrulesdir)

diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy
similarity index 100%
rename from src/login/org.freedesktop.login1.policy.in
rename to src/login/org.freedesktop.login1.policy

diff --git a/src/machine/meson.build b/src/machine/meson.build
index 0f2944c8fe9697b9bb2d5f6ba17ab5ba71e37fd2..b530ca63777d0f0f1559bebd582c453675e50286 100644 (file)
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -43,12 +43,7 @@ if conf.get('ENABLE_MACHINED') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.machine1.service',
                      install_dir : dbussystemservicedir)
-
-        policy = configure_file(
-                input : 'org.freedesktop.machine1.policy.in',
-                output : 'org.freedesktop.machine1.policy',
-                configuration : substs)
-        install_data(policy,
+        install_data('org.freedesktop.machine1.policy',
                      install_dir : polkitpolicydir)
 endif
 

diff --git a/src/machine/org.freedesktop.machine1.policy.in b/src/machine/org.freedesktop.machine1.policy
similarity index 100%
rename from src/machine/org.freedesktop.machine1.policy.in
rename to src/machine/org.freedesktop.machine1.policy

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 7e7876d19faf75cbb4d6e3c26e360f048066726c..16ba83ef88bdf30de800bf23ed671f5d3b9434cd 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -154,6 +154,8 @@ if conf.get('ENABLE_RESOLVE') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.resolve1.service',
                      install_dir : dbussystemservicedir)
+        install_data('org.freedesktop.resolve1.policy',
+                     install_dir : polkitpolicydir)
 
         resolved_conf = configure_file(
                 input : 'resolved.conf.in',
@@ -164,13 +166,6 @@ if conf.get('ENABLE_RESOLVE') == 1
 
         install_data('resolv.conf',
                      install_dir : rootlibexecdir)
-
-        policy = configure_file(
-                input : 'org.freedesktop.resolve1.policy.in',
-                output : 'org.freedesktop.resolve1.policy',
-                configuration : substs)
-        install_data(policy,
-                     install_dir : polkitpolicydir)
 endif
 
 tests += [

diff --git a/src/resolve/org.freedesktop.resolve1.policy.in b/src/resolve/org.freedesktop.resolve1.policy
similarity index 100%
rename from src/resolve/org.freedesktop.resolve1.policy.in
rename to src/resolve/org.freedesktop.resolve1.policy

diff --git a/src/timedate/meson.build b/src/timedate/meson.build
index 6892596b255ebb4b621d366bad27e61737ee0a84..87482c04e5e400adfb08f3357850e16abf5ce1ca 100644 (file)
--- a/src/timedate/meson.build
+++ b/src/timedate/meson.build
@@ -20,11 +20,6 @@ if conf.get('ENABLE_TIMEDATED') == 1
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.timedate1.service',
                      install_dir : dbussystemservicedir)
-
-        policy = configure_file(
-                input : 'org.freedesktop.timedate1.policy.in',
-                output : 'org.freedesktop.timedate1.policy',
-                configuration : substs)
-        install_data(policy,
+        install_data('org.freedesktop.timedate1.policy',
                      install_dir : polkitpolicydir)
 endif

diff --git a/src/timedate/org.freedesktop.timedate1.policy.in b/src/timedate/org.freedesktop.timedate1.policy
similarity index 100%
rename from src/timedate/org.freedesktop.timedate1.policy.in
rename to src/timedate/org.freedesktop.timedate1.policy