diff options
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/afc/meson.build | 2 | ||||
| -rw-r--r-- | monitor/goa/meson.build | 2 | ||||
| -rw-r--r-- | monitor/gphoto2/meson.build | 2 | ||||
| -rw-r--r-- | monitor/meson.build | 2 | ||||
| -rw-r--r-- | monitor/mtp/meson.build | 2 | ||||
| -rw-r--r-- | monitor/proxy/meson.build | 6 | ||||
| -rw-r--r-- | monitor/udisks2/meson.build | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/monitor/afc/meson.build b/monitor/afc/meson.build index 27b1c166..0657512d 100644 --- a/monitor/afc/meson.build +++ b/monitor/afc/meson.build @@ -15,7 +15,7 @@ deps = [ cflags = [ '-DG_LOG_DOMAIN="GVFS-AFC"', '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), ] executable( diff --git a/monitor/goa/meson.build b/monitor/goa/meson.build index 5a66b240..48049bc0 100644 --- a/monitor/goa/meson.build +++ b/monitor/goa/meson.build @@ -14,7 +14,7 @@ deps = [ cflags = [ '-DG_LOG_DOMAIN="GVFS-GOA"', '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), ] executable( diff --git a/monitor/gphoto2/meson.build b/monitor/gphoto2/meson.build index 99ef8ceb..8310da36 100644 --- a/monitor/gphoto2/meson.build +++ b/monitor/gphoto2/meson.build @@ -15,7 +15,7 @@ deps = [ cflags = [ '-DG_LOG_DOMAIN="GVFS-GPhoto2"', '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), ] executable( diff --git a/monitor/meson.build b/monitor/meson.build index 50364210..7b486caf 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -54,7 +54,7 @@ foreach monitor: monitors dbus_service_conf = configuration_data() dbus_service_conf.set('service', dbus_service) - dbus_service_conf.set('exec', gvfs_libexecdir / dbus_exec) + dbus_service_conf.set('exec', gvfs_prefix / gvfs_libexecdir / dbus_exec) dbus_service_conf.set('systemd_service', dbus_systemd_service) monitor_service = configure_file( diff --git a/monitor/mtp/meson.build b/monitor/mtp/meson.build index c76f8aaa..7739c4c6 100644 --- a/monitor/mtp/meson.build +++ b/monitor/mtp/meson.build @@ -14,7 +14,7 @@ deps = [ cflags = [ '-DG_LOG_DOMAIN="GVFS-MTP"', '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), ] executable( diff --git a/monitor/proxy/meson.build b/monitor/proxy/meson.build index 2d616812..18d0cf5c 100644 --- a/monitor/proxy/meson.build +++ b/monitor/proxy/meson.build @@ -23,8 +23,8 @@ deps = [ cflags = [ '-DG_LOG_DOMAIN="GVFS-RemoteVolumeMonitor"', '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), - '-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), + '-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_prefix / gvfs_remote_volume_monitors_dir), ] symbol_map = meson.current_source_dir() / 'symbol.map' @@ -57,7 +57,7 @@ deps = [ cflags = [ '-DG_LOG_DOMAIN="GVFS-RemoteVolumeMonitorDaemon"', - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), ] libgvfsproxyvolumemonitordaemon_noin = static_library( diff --git a/monitor/udisks2/meson.build b/monitor/udisks2/meson.build index f163d888..bbcfb255 100644 --- a/monitor/udisks2/meson.build +++ b/monitor/udisks2/meson.build @@ -29,7 +29,7 @@ cflags = [ '-DG_LOG_DOMAIN="GVFS-UDisks2"', '-DG_DISABLE_DEPRECATED', '-DGIO_MODULE_DIR="@0@"'.format(gio_giomoduledir), - '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir), + '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir), '-DUDISKS_API_IS_SUBJECT_TO_CHANGE', ] |