GNOME.org
 

[gvfs] build: Do not use prefix on directory variables

commit db31059d1b7b11b597b03064329fb1e8899b11f2
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Dec 17 23:25:38 2018 +0100

    build: Do not use prefix on directory variables
    
    Although usually directory variables are set by using the `prefix`
    directory, this might cause issues due to parameters that need
    relative directories.
    
    In order to ease the transition `prefix` directory has been stripped
    from directory variables and only has been appended when necessary.

 client/meson.build          |  4 ++--
 common/meson.build          |  2 +-
 daemon/meson.build          | 10 +++++-----
 meson.build                 | 24 ++++++++++++------------
 metadata/meson.build        |  4 ++--
 monitor/afc/meson.build     |  2 +-
 monitor/goa/meson.build     |  2 +-
 monitor/gphoto2/meson.build |  2 +-
 monitor/meson.build         |  2 +-
 monitor/mtp/meson.build     |  2 +-
 monitor/proxy/meson.build   |  6 +++---
 monitor/udisks2/meson.build |  2 +-
 test/meson.build            |  2 +-
 13 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/client/meson.build b/client/meson.build
index 73b8d7e3..8f57d0d3 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -39,8 +39,8 @@ deps = [
 
 cflags = [
   '-DG_LOG_DOMAIN="@0@"'.format(gvfs_name.to_upper()),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
-  '-DGVFS_MODULE_DIR="@0@"'.format(gvfs_pkglibdir / 'modules'),
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir),
+  '-DGVFS_MODULE_DIR="@0@"'.format(gvfs_prefix / gvfs_pkglibdir / 'modules'),
 ]
 
 symbol_map = meson.current_source_dir() / 'symbol.map'
diff --git a/common/meson.build b/common/meson.build
index beef8c26..b2a2f250 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -28,7 +28,7 @@ deps = [
   gobject_dep,
 ]
 
-cflags = common_cflags + ['-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_remote_volume_monitors_dir)]
+cflags = common_cflags + ['-DREMOTE_VOLUME_MONITORS_DIR="@0@"'.format(gvfs_prefix / 
gvfs_remote_volume_monitors_dir)]
 
 libgvfscommon = shared_library(
   'gvfscommon',
diff --git a/daemon/meson.build b/daemon/meson.build
index e803a743..9c402d22 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -21,7 +21,7 @@ endif
 
 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)
 
 daemon_service = configure_file(
@@ -109,9 +109,9 @@ if enable_keyring
 endif
 
 cflags = [
-  '-DLIBEXEC_DIR="@0@"'.format(gvfs_libexecdir),
-  '-DMOUNTABLE_DIR="@0@"'.format(gvfs_mountdir),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
+  '-DLIBEXEC_DIR="@0@"'.format(gvfs_prefix / gvfs_libexecdir),
+  '-DMOUNTABLE_DIR="@0@"'.format(gvfs_prefix / gvfs_mounts_dir),
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir),
 ]
 
 libgvfsdaemon = shared_library(
@@ -604,7 +604,7 @@ foreach mount: mounts
     output: '@BASENAME@',
     configuration: service_conf,
     install: true,
-    install_dir: gvfs_mountdir,
+    install_dir: gvfs_mounts_dir,
   )
 endforeach
 
diff --git a/meson.build b/meson.build
index 43e126c0..d224cdee 100644
--- a/meson.build
+++ b/meson.build
@@ -10,20 +10,20 @@ gvfs_name = meson.project_name()
 gvfs_version = meson.project_version()
 
 gvfs_prefix = get_option('prefix')
-gvfs_datadir = gvfs_prefix / get_option('datadir')
-gvfs_libdir = gvfs_prefix / get_option('libdir')
-gvfs_libexecdir = gvfs_prefix / get_option('libexecdir')
-gvfs_localedir = gvfs_prefix / get_option('localedir')
-gvfs_mandir = gvfs_prefix / get_option('mandir')
+gvfs_datadir = get_option('datadir')
+gvfs_libdir = get_option('libdir')
+gvfs_libexecdir = get_option('libexecdir')
+gvfs_localedir = get_option('localedir')
+gvfs_mandir = get_option('mandir')
 
 gvfs_pkgdatadir = gvfs_datadir / gvfs_name
 gvfs_pkglibdir = gvfs_libdir / gvfs_name
 
-gvfs_rpath = gvfs_pkglibdir
+gvfs_rpath = gvfs_prefix / gvfs_pkglibdir
 
 gvfs_remote_volume_monitors_dir = gvfs_pkgdatadir / 'remote-volume-monitors'
 
-gvfs_mountdir = gvfs_pkgdatadir / 'mounts'
+gvfs_mounts_dir = gvfs_pkgdatadir / 'mounts'
 
 gvfs_namespace = 'org.gtk.vfs'
 
@@ -240,7 +240,7 @@ config_h.set('HAVE_GCRYPT', enable_gcrypt)
 # *** Check for dbus service dir ***
 dbus_session_bus_services_dir = dependency('dbus-1').get_pkgconfig_variable(
   'session_bus_services_dir',
-  define_variable: ['datadir', gvfs_datadir],
+  define_variable: ['datadir', gvfs_prefix / gvfs_datadir],
 )
 
 dbus_service_in = files('dbus.service.in')
@@ -248,13 +248,13 @@ dbus_service_in = files('dbus.service.in')
 # *** Check for giomoduledir and schemasdir ***
 gio_giomoduledir = gio_dep.get_pkgconfig_variable(
   'giomoduledir',
-  define_variable: ['libdir', gvfs_libdir],
+  define_variable: ['libdir', gvfs_prefix / gvfs_libdir],
 )
 
 gio_schemasdir = gio_dep.get_pkgconfig_variable(
   'schemasdir',
-  define_variable: ['datadir', gvfs_datadir],
-  default: gvfs_datadir / 'glib-2.0/schemas',
+  define_variable: ['datadir', gvfs_prefix / gvfs_datadir],
+  default: gvfs_prefix / gvfs_datadir / 'glib-2.0/schemas',
 )
 
 # *** Check for systemd options ***
@@ -458,7 +458,7 @@ i18n = import('i18n')
 pkg = import('pkgconfig')
 
 service_conf = configuration_data()
-service_conf.set('libexecdir', gvfs_libexecdir)
+service_conf.set('libexecdir', gvfs_prefix / gvfs_libexecdir)
 
 po_dir = meson.source_root() / 'po'
 
diff --git a/metadata/meson.build b/metadata/meson.build
index e51f1564..f847e484 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -18,7 +18,7 @@ endif
 
 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)
 
 metadata_service = configure_file(
@@ -51,7 +51,7 @@ deps = [
 cflags = [
   '-DDBUS_API_SUBJECT_TO_CHANGE',
   '-DG_LOG_DOMAIN="@0@"'.format(gvfs_name.to_upper()),
-  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_localedir),
+  '-DGVFS_LOCALEDIR="@0@"'.format(gvfs_prefix / gvfs_localedir),
 ]
 
 libmetadata = static_library(
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',
 ]
 
diff --git a/test/meson.build b/test/meson.build
index bc53a4f4..599fc0b4 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -3,7 +3,7 @@ if enable_installed_tests
   installed_tests_metadir = gvfs_datadir / 'installed-tests' / gvfs_name
 
   tests_conf = configuration_data()
-  tests_conf.set('testdir', installed_tests_execdir)
+  tests_conf.set('testdir', gvfs_prefix / installed_tests_execdir)
 
   configure_file(
     input: 'session.conf.in',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]