build: Centralize path absolutizationwip/jtojnar/clean-meson-paths

We use absolute paths everywhere so let’s just do that in the top-level meson.build.

4 files changed, 14 insertions, 16 deletions

diff --git a/meson.build b/meson.build
index c934a8a9..a2cb760e 100644
--- a/meson.build
+++ b/meson.build
@@ -17,13 +17,13 @@ eog_gir_ns = 'Eog'
 eog_gir_version = '1.0'
 
 eog_prefix = get_option('prefix')
-eog_datadir = get_option('datadir')
-eog_libdir = get_option('libdir')
-eog_localedir = get_option('localedir')
+eog_datadir = eog_prefix / get_option('datadir')
+eog_libdir = eog_prefix / get_option('libdir')
+eog_localedir = eog_prefix / get_option('localedir')
 
 eog_pkgdatadir = eog_datadir / meson.project_name()
 eog_pkglibdir = eog_libdir / meson.project_name()
-eog_pkglibexecdir = get_option('libexecdir') / meson.project_name()
+eog_pkglibexecdir = eog_prefix / get_option('libexecdir') / meson.project_name()
 
 eog_pluginsdir = eog_pkglibdir / 'plugins'
 
@@ -126,8 +126,8 @@ common_deps = [
 
 gio_schemasdir = gio_dep.get_pkgconfig_variable(
   'schemasdir',
-  define_variable: ['datadir', eog_prefix / eog_datadir],
-  default: eog_prefix / eog_datadir / 'glib-2.0/schemas',
+  define_variable: ['datadir', eog_datadir],
+  default: eog_datadir / 'glib-2.0/schemas',
 )
 
 # ZLIB support (required)
diff --git a/meson_post_install.py b/meson_post_install.py
index 7e554684..686b802a 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -5,9 +5,7 @@ import subprocess
 import sys
 
 if not os.environ.get('DESTDIR'):
-  prefix = os.environ['MESON_INSTALL_PREFIX']
-
-  icondir = os.path.join(prefix, sys.argv[1], 'icons', 'hicolor')
+  icondir = os.path.join(sys.argv[1], 'icons', 'hicolor')
   print('Update icon cache...')
   subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])
 
diff --git a/src/meson.build b/src/meson.build
index 7416a208..08ea4275 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -134,9 +134,9 @@ deps = common_deps + [
 
 cflags = [
   '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name().to_upper()),
-  '-DEOG_DATA_DIR="@0@"'.format(eog_prefix / eog_pkgdatadir),
-  '-DEOG_PLUGIN_DIR="@0@"'.format(eog_prefix / eog_pluginsdir),
-  '-DLIBDIR="@0@"'.format(eog_prefix / eog_libdir),
+  '-DEOG_DATA_DIR="@0@"'.format(eog_pkgdatadir),
+  '-DEOG_PLUGIN_DIR="@0@"'.format(eog_pluginsdir),
+  '-DLIBDIR="@0@"'.format(eog_libdir),
 ]
 
 symbol_map = meson.current_source_dir() / 'symbol.map'
@@ -182,7 +182,7 @@ pkg.generate(
   requires: 'gtk+-3.0',
   variables: [
     'exec_prefix=${prefix}',
-    # the equivalent of eog_pluginsdir but using ${libdir} fro variable replacement
+    # the equivalent of eog_pluginsdir but using ${libdir} for variable replacement
     'pluginsdir=' + ('${libdir}' / meson.project_name() / 'plugins'),
   ],
 )
@@ -191,7 +191,7 @@ deps = [libeog_dep]
 
 cflags = [
   '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name().to_upper()),
-  '-DEOG_LOCALE_DIR="@0@"'.format(eog_prefix / eog_localedir),
+  '-DEOG_LOCALE_DIR="@0@"'.format(eog_localedir),
 ]
 
 if enable_introspection
@@ -205,7 +205,7 @@ eog = executable(
   dependencies: deps,
   c_args: cflags,
   install: true,
-  install_rpath: eog_prefix / eog_pkglibdir,
+  install_rpath: eog_pkglibdir,
 )
 
 if enable_introspection
diff --git a/tests/meson.build b/tests/meson.build
index f72990c0..497c56b0 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,4 +1,4 @@
-tests_execdir = eog_prefix / eog_pkglibexecdir / 'installed-tests'
+tests_execdir = eog_pkglibexecdir / 'installed-tests'
 tests_metadir = eog_datadir / 'installed-tests' / meson.project_name()
 
 tests_data = files(