[meld: 4/10] build: Do not use prefix on directory variables

[Kai Willadsen <kaiw src gnome org>]

commit 8d096e3e0d1f9a8f107dab3365d02303c40155c1
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Sun Feb 14 20:53:22 2021 +0100

    build: Do not use prefix on directory variables
    
    The use of `prefix` on directory variables might cause issues due to
    parameters that need relative directories. It is also not necessary
    because meson already handles relative paths.
    
    Due to this, `prefix` has been stripped from directory variables and
    only has been appended when necessary.

 meld/meson.build | 4 ++--
 meson.build      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meld/meson.build b/meld/meson.build
index bf2f0621..1843945d 100644
--- a/meld/meson.build
+++ b/meld/meson.build
@@ -87,8 +87,8 @@ app_config = configuration_data()
 app_config.set('profile', profile)
 app_config.set('application_id', application_id)
 app_config.set('resource_base_id', resource_base_id)
-app_config.set('localedir', localedir)
-app_config.set('pkgdatadir', pkgdatadir)
+app_config.set('localedir', prefix / localedir)
+app_config.set('pkgdatadir', prefix / pkgdatadir)
 app_config.set('configured', 'True')
 
 configure_file(
diff --git a/meson.build b/meson.build
index 3dd7790f..e812f3c0 100644
--- a/meson.build
+++ b/meson.build
@@ -32,10 +32,10 @@ application_id = 'org.gnome.Meld@0@'.format(profile)
 
 prefix = get_option('prefix')
 
-bindir = prefix / get_option('bindir')
-datadir = prefix / get_option('datadir')
-localedir = prefix / get_option('localedir')
-mandir = prefix / get_option('mandir')
+bindir = get_option('bindir')
+datadir = get_option('datadir')
+localedir = get_option('localedir')
+mandir = get_option('mandir')
 
 icondir = datadir / 'icons'
 pkgdatadir = datadir / meson.project_name()