diff --git a/INSTALL b/INSTALL index fc64386..c7cfa68 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ To build using meson ==================== -meson build +meson setup build cd build ninja ninja install @@ -8,7 +8,7 @@ ninja install Or without chdir ================ -meson build +meson setup build ninja -C build ninja -C build install diff --git a/meson.build b/meson.build index d1f3a65..de56bd5 100644 --- a/meson.build +++ b/meson.build @@ -3,16 +3,16 @@ project('places', 'c', version: '0.2.0', license: 'GPL v3', - meson_version: '>= 0.47.0') + meson_version: '>= 0.58.0') gettext_domain = 'e-module-' + meson.project_name() #### Enlightenemnt #### dep_e = dependency('enlightenment', version: '>= 0.23.99') -e_modules_dir = dep_e.get_pkgconfig_variable('modules') -e_release = dep_e.get_pkgconfig_variable('release') -e_module_arch = dep_e.get_pkgconfig_variable('module_arch') +e_modules_dir = dep_e.get_variable('modules') +e_release = dep_e.get_variable('release') +e_module_arch = dep_e.get_variable('module_arch') #### Install dirs #### @@ -70,7 +70,7 @@ if get_option('nls') cc = meson.get_compiler('c') dep_intl = cc.find_library('intl', required : false) subdir('po') -endif +endif #### Edje cc #### @@ -89,7 +89,7 @@ configure_file(output: 'places_config.h', configuration: config_h) install_data('module.desktop', install_dir: mod_install_dir) cmd = [ edje_cc, - '-id', join_paths(meson.source_root(), 'images'), + '-id', join_paths(meson.project_source_root(), 'images'), '@INPUT@', '@OUTPUT@'] custom_target('e-module-places.edj', input : 'e-module-places.edc',