davemds pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/penguins.git/commit/?id=1f0b49b6b037266f61bc800b679ef15bfacf594b
commit 1f0b49b6b037266f61bc800b679ef15bfacf594b Author: Dave Andreoli <[email protected]> Date: Sat Apr 18 23:52:17 2020 +0200 Penguins: use new module_arch provided by E --- meson.build | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 0b9dbd6..796f734 100644 --- a/meson.build +++ b/meson.build @@ -12,26 +12,12 @@ gettext_domain = 'e-module-' + meson.project_name() 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 #### @@ -46,6 +32,7 @@ config_dir = include_directories('.') dep_intl = [] if get_option('nls') config_h.set('HAVE_GETTEXT', '1') + cc = meson.get_compiler('c') dep_intl = cc.find_library('intl', required : false) subdir('po') endif --
