diff options
author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-14 12:20:18 +0200 |
---|---|---|
committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-10-25 15:56:32 +0200 |
commit | bd28f63522e4198bfff5029867437f0d734f1fda (patch) | |
tree | cbd094a2bca1b04838495386abeb642a07bac936 | |
parent | a81cf0e203fb11c23f5c6bee3dff42b6a7ff299e (diff) | |
download | gvfs-bd28f63522e4198bfff5029867437f0d734f1fda.tar.gz |
build: Improve the use of file generation on configure time
The files generated on configure time have been improved by the
stacking multiple configuration processes, use of generator tags and
the use of dictionaries.
-rw-r--r-- | daemon/meson.build | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/daemon/meson.build b/daemon/meson.build index eac85a2c..5f9559aa 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -359,30 +359,23 @@ if enable_admin policy = gvfs_namespace + '.file-operations.policy' - policy_in = configure_file( - input: policy + '.in.in', - output: '@BASENAME@', - configuration: service_conf, - ) - i18n.merge_file( policy, - input: policy_in, + input: configure_file( + input: policy + '.in.in', + output: '@BASENAME@', + configuration: service_conf, + ), output: '@BASENAME@', po_dir: po_dir, install: true, install_dir: gvfs_datadir / 'polkit-1/actions', ) - rules = gvfs_namespace + '.file-operations.rules' - - rules_conf = configuration_data() - rules_conf.set('PRIVILEGED_GROUP', privileged_group) - configure_file( - input: rules + '.in', - output: rules, - configuration: rules_conf, + input: gvfs_namespace + '.file-operations.rules.in', + output: '@BASENAME@', + configuration: {'PRIVILEGED_GROUP': privileged_group}, install_dir: gvfs_datadir / 'polkit-1/rules.d', ) endif |