[gedit] build: config.h: do not use libdir and datadir variables
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] build: config.h: do not use libdir and datadir variables
- Date: Thu, 5 Dec 2019 15:03:03 +0000 (UTC)
commit 43292685315cd10767f56dd8d54548b648a6c69d
Author: Sébastien Wilmet <swilmet gnome org>
Date: Thu Dec 5 15:28:48 2019 +0100
build: config.h: do not use libdir and datadir variables
From my point of view all these variables make things less clear.
When reading "get_option('prefix')" etc, we know what it really is.
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index e9d1c1561..f2047a13e 100644
--- a/meson.build
+++ b/meson.build
@@ -88,8 +88,8 @@ endif
config_h = configuration_data()
config_h.set_quoted('PACKAGE_STRING', package_string)
config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-config_h.set_quoted('LIBDIR', libdir)
-config_h.set_quoted('DATADIR', datadir)
+config_h.set_quoted('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+config_h.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
config_h.set_quoted('VERSION', meson.project_version())
version_array = meson.project_version().split('.')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]