diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-12-17 21:13:19 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-01-04 16:33:53 +0100 |
| commit | 12f4c5a98e1b4a1a0b5fba45439dab74d12519bb (patch) | |
| tree | e6eb7e989be6f88c463ff0bcb16e45634cb7638a | |
| parent | 22e9f7721b891b17cd726f1bf92b15a35be34d22 (diff) | |
| download | gvfs-12f4c5a98e1b4a1a0b5fba45439dab74d12519bb.tar.gz | |
build: Fix the parameter order in configure_file
The `install` and `install_dir` parameters must be the last
parameters in the `configure_file` function.
The paremeters have been reordered to fix this issue.
| -rw-r--r-- | daemon/meson.build | 6 | ||||
| -rw-r--r-- | metadata/meson.build | 4 | ||||
| -rw-r--r-- | monitor/meson.build | 4 | ||||
| -rw-r--r-- | test/meson.build | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/daemon/meson.build b/daemon/meson.build index 70b0346c..a219fc13 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -11,9 +11,9 @@ if install_systemd_systemduserunitdir configure_file( input: service + '.in', output: service, + configuration: service_conf, install: true, install_dir: systemd_systemduserunitdir, - configuration: service_conf, ) dbus_systemd_service = 'SystemdService=' + service @@ -27,9 +27,9 @@ dbus_service_conf.set('systemd_service', dbus_systemd_service) daemon_service = configure_file( input: dbus_service_in, output: dbus_service + '.service', + configuration: dbus_service_conf, install: true, install_dir: dbus_session_bus_services_dir, - configuration: dbus_service_conf, ) gnome.mkenums( @@ -604,9 +604,9 @@ foreach mount: mounts configure_file( input: name + '.in', output: name, + configuration: service_conf, install: true, install_dir: gvfs_mountdir, - configuration: service_conf, ) endforeach diff --git a/metadata/meson.build b/metadata/meson.build index 081213dd..20ef5e03 100644 --- a/metadata/meson.build +++ b/metadata/meson.build @@ -8,9 +8,9 @@ if install_systemd_systemduserunitdir configure_file( input: service + '.in', output: service, + configuration: service_conf, install: true, install_dir: systemd_systemduserunitdir, - configuration: service_conf, ) dbus_systemd_service = 'SystemdService=' + service @@ -24,9 +24,9 @@ dbus_service_conf.set('systemd_service', dbus_systemd_service) metadata_service = configure_file( input: dbus_service_in, output: dbus_service + '.service', + configuration: dbus_service_conf, install: true, install_dir: dbus_session_bus_services_dir, - configuration: dbus_service_conf, ) # FIXME: Ugly workaround that simulates the generation of diff --git a/monitor/meson.build b/monitor/meson.build index e32817ad..eaf4ac0b 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -37,9 +37,9 @@ foreach monitor: monitors configure_file( input: monitor_name / service + '.in', output: service, + configuration: service_conf, install: true, install_dir: systemd_systemduserunitdir, - configuration: service_conf, ) dbus_systemd_service = 'SystemdService=' + service @@ -60,9 +60,9 @@ foreach monitor: monitors monitor_service = configure_file( input: dbus_service_in, output: dbus_service + '.service', + configuration: dbus_service_conf, install: true, install_dir: dbus_session_bus_services_dir, - configuration: dbus_service_conf, ) if monitor[1] diff --git a/test/meson.build b/test/meson.build index 271b4a4d..d91a65e3 100644 --- a/test/meson.build +++ b/test/meson.build @@ -10,9 +10,9 @@ if enable_installed_tests configure_file( input: session + '.in', output: session, + configuration: tests_conf, install: true, install_dir: installed_tests_execdir, - configuration: tests_conf, ) all_tests = 'gvfs-all-tests' @@ -20,9 +20,9 @@ if enable_installed_tests configure_file( input: all_tests + '.in', output: all_tests + '.test', + configuration: tests_conf, install: true, install_dir: installed_tests_metadir, - configuration: tests_conf, ) install_subdir( |