raster pushed a commit to tag v0.23.0-alpha. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c17a116d9077f56be84c3bca3f3e68b2b4bbf958
commit c17a116d9077f56be84c3bca3f3e68b2b4bbf958 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Mon May 20 12:34:28 2019 +0100 Pass meson dist - we have to install config.h and not use install option install option for configure_file is a 0.50 feature - stick to 0.47 stuff so we can pass meson dist --- data/etc/meson.build | 1 - data/units/meson.build | 1 - meson.build | 6 +++--- src/bin/meson.build | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/data/etc/meson.build b/data/etc/meson.build index b76f5d5e7..bd737062b 100644 --- a/data/etc/meson.build +++ b/data/etc/meson.build @@ -61,7 +61,6 @@ sysactions.set('EJECT' , EJECT) if get_option('install-sysactions') configure_file(input : 'sysactions.conf.in', output : 'sysactions.conf', - install : true, install_dir : join_paths(dir_sysconf, 'enlightenment'), configuration: sysactions ) diff --git a/data/units/meson.build b/data/units/meson.build index d0422386f..15cd5013e 100644 --- a/data/units/meson.build +++ b/data/units/meson.build @@ -3,7 +3,6 @@ unit_config.set('prefix', dir_prefix) if get_option('systemd') == true configure_file(input : 'enlightenment.service.in', output : 'enlightenment.service', - install : true, install_dir : systemd_unitdir, configuration: unit_config ) diff --git a/meson.build b/meson.build index 728facb54..a790e3828 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('enlightenment', 'c', version : '0.22.99', license : 'BSD 2 clause', - default_options: [ 'buildtype=plain', 'c_std=gnu99', 'warning_level=2' ], + default_options: [ 'buildtype=release', 'c_std=gnu99', 'warning_level=2' ], meson_version : '>= 0.47.0') ##### convenience variables for later @@ -374,8 +374,8 @@ if config_h.has('HAVE_WAYLAND') == true endif configure_file(output : 'config.h', - install : false, - configuration: config_h) + configuration: config_h, + install_dir : dir_include_e) pkgconfig.generate(name : proj, description : 'Enlightenment Window Manager', diff --git a/src/bin/meson.build b/src/bin/meson.build index b4ad50ab2..54940a507 100644 --- a/src/bin/meson.build +++ b/src/bin/meson.build @@ -9,7 +9,6 @@ e_fm_shared_types.set10('DBUS_MOUNT_CONFIG', config_h.has('HAVE_UDISKS_MOUNT')) configure_file(input : 'e_fm_shared_types.h.in', output : 'e_fm_shared_types.h', configuration: e_fm_shared_types, - install : true, install_dir : dir_include_e) deps_e = [ --
