diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-10-04 19:25:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 19:25:30 +0200 |
| commit | 4aa1d31c89c8fb74e70eed5849c780c4678829a3 (patch) | |
| tree | d177744263d38b99f48c018cb11e2e4b385d9e90 /units | |
| parent | 5ad90fe376398052c8ca1267b5cef43cec857df1 (diff) | |
| parent | a9149d876bd4a345a1156061f907bce0384702c8 (diff) | |
| download | systemd-4aa1d31c89c8fb74e70eed5849c780c4678829a3.tar.gz | |
Merge pull request #6974 from keszybz/clean-up-defines
Clean up define definitions
Diffstat (limited to 'units')
| -rw-r--r-- | units/meson.build | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/units/meson.build b/units/meson.build index 2024d0bfa1..8494d23e9e 100644 --- a/units/meson.build +++ b/units/meson.build @@ -180,7 +180,7 @@ in_units = [ ['systemd-reboot.service', ''], ['systemd-remount-fs.service', '', 'local-fs.target.wants/'], - ['systemd-resolved.service', 'ENABLE_RESOLVED', + ['systemd-resolved.service', 'ENABLE_RESOLVE', join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], ['systemd-rfkill.service', 'ENABLE_RFKILL'], @@ -205,9 +205,9 @@ in_units = [ 'sysinit.target.wants/'], ['systemd-update-done.service', '', 'sysinit.target.wants/'], - ['systemd-update-utmp-runlevel.service', 'HAVE_UTMP HAVE_SYSV_COMPAT', + ['systemd-update-utmp-runlevel.service', 'ENABLE_UTMP HAVE_SYSV_COMPAT', 'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'], - ['systemd-update-utmp.service', 'HAVE_UTMP', + ['systemd-update-utmp.service', 'ENABLE_UTMP', 'sysinit.target.wants/'], ['systemd-user-sessions.service', '', 'multi-user.target.wants/'], @@ -244,8 +244,8 @@ foreach tuple : in_units # we do this here because install_data does not accept custom_target output conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], false)) and - (conds.get(1, '') == '' or conf.get(conds[1], false))) + install = ((conds.get(0, '') == '' or conf.get(conds[0]) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1]) == 1)) gen1 = configure_file( input : file + '.in', @@ -273,8 +273,8 @@ foreach tuple : m4_units # we do this here because install_data does not accept custom_target output conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], false)) and - (conds.get(1, '') == '' or conf.get(conds[1], false))) + install = ((conds.get(0, '') == '' or conf.get(conds[0]) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1]) == 1)) custom_target( file, @@ -297,8 +297,8 @@ foreach tuple : units input = tuple.get(3, file) conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], false)) and - (conds.get(1, '') == '' or conf.get(conds[1], false))) + install = ((conds.get(0, '') == '' or conf.get(conds[0]) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1]) == 1)) if install install_data(input, @@ -321,7 +321,7 @@ meson.add_install_script(meson_make_symlink, meson.add_install_script(meson_make_symlink, join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) -if conf.get('HAVE_SYSV_COMPAT', false) +if conf.get('HAVE_SYSV_COMPAT') == 1 foreach i : [1, 2, 3, 4, 5] meson.add_install_script( 'sh', '-c', |