diff --git a/src/hostname/meson.build b/src/hostname/meson.build index c35c6688ba..1ab9271b4c 100644 --- 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 e5088b3434..975afc624d 100644 --- 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 30882cc027..6b85f6bea6 100644 --- 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 599c44ea97..5b75382e5f 100644 --- 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 0f2944c8fe..b530ca6377 100644 --- 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 7e7876d19f..16ba83ef88 100644 --- 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 6892596b25..87482c04e5 100644 --- 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