Penguins: use new module_arch provided by E

This commit is contained in:
Davide Andreoli 2020-04-18 23:52:17 +02:00
parent 8aaac7de92
commit 1f0b49b6b0
1 changed files with 3 additions and 16 deletions

View File

@ -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