diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-29 21:10:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 21:10:03 +0200 |
| commit | 53877d0385129a7b4b4a8ebb8a43982252bc7650 (patch) | |
| tree | ab0d434311824b5cfb1c3e38e000a8be5c1e080a /meson.build | |
| parent | Merge pull request #22871 from yuwata/udev-worker-error-code (diff) | |
| parent | Rename UnitFileScope to LookupScope (diff) | |
| download | systemd-53877d0385129a7b4b4a8ebb8a43982252bc7650.tar.xz systemd-53877d0385129a7b4b4a8ebb8a43982252bc7650.zip | |
Merge pull request #22649 from keszybz/symlink-enablement-yet-again-punish-me-harder
Fixups to the unit enablement logic
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/meson.build b/meson.build index a2d397d5fc..e68791b8b4 100644 --- a/meson.build +++ b/meson.build @@ -2450,7 +2450,7 @@ public_programs += executable( install_rpath : rootlibexecdir, install : true) -public_programs += executable( +systemctl = executable( 'systemctl', systemctl_sources, include_directories : includes, @@ -2464,6 +2464,7 @@ public_programs += executable( install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) +public_programs += systemctl if conf.get('ENABLE_PORTABLED') == 1 dbus_programs += executable( @@ -3282,13 +3283,22 @@ executable( install : true, install_dir : rootlibexecdir) -public_programs += executable( +systemd_id128 = executable( 'systemd-id128', 'src/id128/id128.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true) +public_programs += systemd_id128 + +if want_tests != 'false' + test('test-systemctl-enable', + test_systemctl_enable_sh, + # https://github.com/mesonbuild/meson/issues/2681 + args : [systemctl.full_path(), + systemd_id128.full_path()]) +endif public_programs += executable( 'systemd-path', |