[gedit/zbrown/deteplification-src: 86/633] build: config.h: do not use libdir and datadir variables




commit 33744d2dfd0dd05ad05fbc0b7f0ad7729c08db46
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 7667092bb..7571d934a 100644
--- a/meson.build
+++ b/meson.build
@@ -95,8 +95,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())
 
 enable_gvfs_metadata = get_option('enable-gvfs-metadata')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]