diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-08-02 11:59:24 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-08-05 09:16:24 +0200 |
| commit | b048258a2a82c5945993454cc921dc4b73433df9 (patch) | |
| tree | 6c46f1892a4fee233d0a044de8f4e105f572402a | |
| parent | 1b115388d44410fe51c8f0401ac37c4c398d1616 (diff) | |
| download | NetworkManager-bg/meson-fixes.tar.gz | |
build: fix meson warning about 'install' arg in 'configure_file'bg/meson-fixes
WARNING: Project targetting '>= 0.44.0' but tried to use feature
introduced in '0.50.0': install arg in configure_file
From the documentation:
"install (added 0.50.0) When true, this generated file is installed
during the install step, and install_dir must be set and not
empty. When false, this generated file is not installed regardless of
the value of install_dir. When omitted it defaults to true when
install_dir is set and not empty, false otherwise."
The parameter can be omitted because install_dir is set.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/216
| -rw-r--r-- | data/meson.build | 2 | ||||
| -rw-r--r-- | dispatcher/meson.build | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/data/meson.build b/data/meson.build index f496bf0135..9025eae452 100644 --- a/data/meson.build +++ b/data/meson.build @@ -11,7 +11,6 @@ server = 'server.conf' configure_file( input: server + '.in', output: server, - install: true, install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'), configuration: data_conf, ) @@ -32,7 +31,6 @@ if install_systemd_unit_dir configure_file( input: service + '.in', output: service, - install: true, install_dir: systemd_system_unit_dir, configuration: data_conf, ) diff --git a/dispatcher/meson.build b/dispatcher/meson.build index da9ac7f292..0706ab07a2 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -13,7 +13,6 @@ service = 'org.freedesktop.nm_dispatcher.service' configure_file( input: service + '.in', output: service, - install: true, install_dir: dbus_sys_dir, configuration: service_conf, ) |