[retro-gtk] meson: Unify dir definitions
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] meson: Unify dir definitions
- Date: Mon, 26 Oct 2020 19:48:40 +0000 (UTC)
commit d5f4d75850a66f908dc40caeb537acbf73be82aa
Author: Adrien Plazas <kekun plazas laposte net>
Date: Fri Oct 16 08:36:08 2020 +0200
meson: Unify dir definitions
This unifies and simplifies the code a bit more.
meson.build | 8 +++-----
tests/meson.build | 5 ++---
2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6605dc70..366872df 100644
--- a/meson.build
+++ b/meson.build
@@ -3,9 +3,6 @@ project('retro-gtk','c',
meson_version: '>= 0.50.0',
)
-retro_gtk_prefix = get_option('prefix')
-retro_gtk_datadir = retro_gtk_prefix / get_option('datadir')
-
cc = meson.get_compiler('c')
gnome = import('gnome')
@@ -13,6 +10,7 @@ prefix = get_option('prefix')
libdir = prefix / get_option('libdir')
libexecdir = prefix / get_option('libexecdir')
libretrodir = libdir / 'libretro'
+datadir = prefix / get_option('datadir')
confinc = include_directories('.')
shared_inc = include_directories('shared')
@@ -69,8 +67,8 @@ summary = [
' Install documentation: @0@'.format(get_option('install-doc')),
' Demos: @0@'.format(get_option('demos')),
'Directories:',
- ' prefix: @0@'.format(retro_gtk_prefix),
- ' datadir: @0@'.format(retro_gtk_datadir),
+ ' prefix: @0@'.format(prefix),
+ ' datadir: @0@'.format(datadir),
'------',
''
]
diff --git a/tests/meson.build b/tests/meson.build
index 3c950101..d8973d3f 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,5 @@
-retro_gtk_libexecdir = retro_gtk_prefix / get_option('libexecdir')
-installed_test_bindir = retro_gtk_libexecdir / 'installed-tests' / retro_gtk_module
-installed_test_datadir = retro_gtk_datadir / 'installed-tests' / retro_gtk_module
+installed_test_bindir = libexecdir / 'installed-tests' / retro_gtk_module
+installed_test_datadir = datadir / 'installed-tests' / retro_gtk_module
testlibretrodir = installed_test_datadir / 'libretro'
testexecdir = installed_test_bindir
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]