diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-12-17 21:08:43 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-01-21 21:18:06 +0100 |
| commit | bced2bd5c383935c1487e0d72800c6439e5859c8 (patch) | |
| tree | 663e79305c7bdbf0ef8895d6afb4a19266b0ea3d /daemon | |
| parent | ce13717c433c841f7b3e749ccedcdfc830c4f761 (diff) | |
| download | gvfs-bced2bd5c383935c1487e0d72800c6439e5859c8.tar.gz | |
build: Fix the use of pkg-config file variables
The names of the variables in meson corresponding to the variables
obtained from the pkg-config files has been fixed by using a
pattern.
The pattern uses the dependency name as the prefix and the obtained
variable as the suffix.
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/daemon/meson.build b/daemon/meson.build index 4f3155ef..70b0346c 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -5,14 +5,14 @@ dbus_service = gvfs_namespace + '.Daemon' dbus_exec = 'gvfsd' dbus_systemd_service = '' -if install_systemd_user_unit_dir +if install_systemd_systemduserunitdir service = 'gvfs-daemon.service' configure_file( input: service + '.in', output: service, install: true, - install_dir: systemd_user_unit_dir, + install_dir: systemd_systemduserunitdir, configuration: service_conf, ) @@ -28,7 +28,7 @@ daemon_service = configure_file( input: dbus_service_in, output: dbus_service + '.service', install: true, - install_dir: dbus_service_dir, + install_dir: dbus_session_bus_services_dir, configuration: dbus_service_conf, ) @@ -42,7 +42,7 @@ gnome.mkenums( vtail: ' </@type@>', ftail: '</schemalist>', install_header: true, - install_dir: gvfs_schema_dir, + install_dir: gio_schemasdir, ) sources = files( @@ -630,7 +630,7 @@ endif install_data( schema_data, - install_dir: gvfs_schema_dir, + install_dir: gio_schemasdir, ) install_data( |