diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-16 12:48:55 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-16 13:01:12 +0100 |
| commit | 9b3cff199dd3827a9f2df9a7f5874d6ef18880f2 (patch) | |
| tree | 95b792c1e3a496c1130c5269be83ee5bed6b6ae8 /src/resolve | |
| parent | meson: drop double .in suffix for o.fd.systemd1.policy file (diff) | |
| download | systemd-9b3cff199dd3827a9f2df9a7f5874d6ef18880f2.tar.xz systemd-9b3cff199dd3827a9f2df9a7f5874d6ef18880f2.zip | |
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.
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/meson.build | 9 | ||||
| -rw-r--r-- | src/resolve/org.freedesktop.resolve1.policy (renamed from src/resolve/org.freedesktop.resolve1.policy.in) | 0 |
2 files changed, 2 insertions, 7 deletions
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 index b65ba3e56a..b65ba3e56a 100644 --- a/src/resolve/org.freedesktop.resolve1.policy.in +++ b/src/resolve/org.freedesktop.resolve1.policy |