diff options
| author | Ondrej Holy <oholy@redhat.com> | 2019-01-07 17:44:09 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2019-01-07 17:44:09 +0100 |
| commit | 47203abf0b087be1fbf936d4040291e97fe39e16 (patch) | |
| tree | 92559d613009f763cc67df5a8a019d2bdde963ef /meson.build | |
| parent | d1974938a5acaaed2cfee8da6dc254c74c0d4fb6 (diff) | |
| download | gvfs-47203abf0b087be1fbf936d4040291e97fe39e16.tar.gz | |
Revert "build: Do not use prefix on directory variables"
This reverts commit db31059d1b7b11b597b03064329fb1e8899b11f2.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meson.build b/meson.build index d224cdee..43e126c0 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 = get_option('datadir') -gvfs_libdir = get_option('libdir') -gvfs_libexecdir = get_option('libexecdir') -gvfs_localedir = get_option('localedir') -gvfs_mandir = get_option('mandir') +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_pkgdatadir = gvfs_datadir / gvfs_name gvfs_pkglibdir = gvfs_libdir / gvfs_name -gvfs_rpath = gvfs_prefix / gvfs_pkglibdir +gvfs_rpath = gvfs_pkglibdir gvfs_remote_volume_monitors_dir = gvfs_pkgdatadir / 'remote-volume-monitors' -gvfs_mounts_dir = gvfs_pkgdatadir / 'mounts' +gvfs_mountdir = 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_prefix / gvfs_datadir], + define_variable: ['datadir', 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_prefix / gvfs_libdir], + define_variable: ['libdir', gvfs_libdir], ) gio_schemasdir = gio_dep.get_pkgconfig_variable( 'schemasdir', - define_variable: ['datadir', gvfs_prefix / gvfs_datadir], - default: gvfs_prefix / gvfs_datadir / 'glib-2.0/schemas', + define_variable: ['datadir', gvfs_datadir], + default: 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_prefix / gvfs_libexecdir) +service_conf.set('libexecdir', gvfs_libexecdir) po_dir = meson.source_root() / 'po' |