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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-02-16 12:48:55 +01:00
parent 70886abbde
commit 9b3cff199d
14 changed files with 8 additions and 43 deletions

View File

@ -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

View File

@ -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',

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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 += [

View File

@ -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