enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

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
This commit is contained in:
Carsten Haitzler 2019-05-20 12:34:28 +01:00
parent 5aedf54042
commit 92b03ded05
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/etc/meson.build
View File

@ -61,7 +61,6 @@ sysactions.set('EJECT' , EJECT)
if get_option('install-sysactions') if get_option('install-sysactions')
configure_file(input : 'sysactions.conf.in', configure_file(input : 'sysactions.conf.in',
output : 'sysactions.conf', output : 'sysactions.conf',
install : true,
install_dir : join_paths(dir_sysconf, 'enlightenment'), install_dir : join_paths(dir_sysconf, 'enlightenment'),
configuration: sysactions configuration: sysactions
) )

1
data/units/meson.build
View File

@ -3,7 +3,6 @@ unit_config.set('prefix', dir_prefix)
if get_option('systemd') == true if get_option('systemd') == true
configure_file(input : 'enlightenment.service.in', configure_file(input : 'enlightenment.service.in',
output : 'enlightenment.service', output : 'enlightenment.service',
install : true,
install_dir : systemd_unitdir, install_dir : systemd_unitdir,
configuration: unit_config configuration: unit_config
) )

6
meson.build
View File

@ -2,7 +2,7 @@
project('enlightenment', 'c', project('enlightenment', 'c',
version : '0.22.99', version : '0.22.99',
license : 'BSD 2 clause', 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') meson_version : '>= 0.47.0')
##### convenience variables for later ##### convenience variables for later
@ -374,8 +374,8 @@ if config_h.has('HAVE_WAYLAND') == true
endif endif
configure_file(output : 'config.h', configure_file(output : 'config.h',
install : false, configuration: config_h,
configuration: config_h) install_dir : dir_include_e)
pkgconfig.generate(name : proj, pkgconfig.generate(name : proj,
description : 'Enlightenment Window Manager', description : 'Enlightenment Window Manager',

1
src/bin/meson.build
View File

@ -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', configure_file(input : 'e_fm_shared_types.h.in',
output : 'e_fm_shared_types.h', output : 'e_fm_shared_types.h',
configuration: e_fm_shared_types, configuration: e_fm_shared_types,
install : true,
install_dir : dir_include_e) install_dir : dir_include_e)
deps_e = [ deps_e = [