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
devs/bu5hm4n/fix
Carsten Haitzler 3 years ago
parent 5aedf54042
commit 92b03ded05
  1. 1
      data/etc/meson.build
  2. 1
      data/units/meson.build
  3. 6
      meson.build
  4. 1
      src/bin/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
)

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

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

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

Loading…
Cancel
Save