From 911bb3ccc773507164f32dee32919c92b8e1a60f Mon Sep 17 00:00:00 2001 From: Dave Andreoli Date: Sat, 18 Apr 2020 23:54:27 +0200 Subject: [PATCH] Extramenu: use new module_arch provided by E --- meson.build | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 9a7d237..f7fa6e8 100644 --- a/meson.build +++ b/meson.build @@ -10,26 +10,12 @@ project('extramenu', 'c', dep_e = dependency('enlightenment') e_modules_dir = dep_e.get_pkgconfig_variable('modules') e_release = dep_e.get_pkgconfig_variable('release') - - -#### Host arch #### -host_os = host_machine.system() -if host_os == 'linux' - cc = meson.get_compiler('c') - if cc.has_header_symbol('features.h', '__UCLIBC__') - host_os = 'linux-uclibc' - elif cc.has_header_symbol('features.h', '__dietlibc__') - host_os = 'linux-dietlibc' - else - host_os = 'linux-gnu' - endif -endif -mod_arch = '@0@-@1@-@2@'.format(host_os, host_machine.cpu_family(), e_release) +e_module_arch = dep_e.get_pkgconfig_variable('module_arch') #### Install dirs #### mod_install_dir = join_paths(e_modules_dir, meson.project_name()) -lib_install_dir = join_paths(mod_install_dir, mod_arch) +lib_install_dir = join_paths(mod_install_dir, e_module_arch) #### config.h ####