diff options
| author |   Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-13 20:17:04 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:28 -0400 |
| commit | 9ac47f38151808712f1bdcae8e2eb42a0b53e5ca (patch) | |
| tree | dd1854ac638fd4e2f6b6856ab7e0d81545f01d63 | |
| parent | meson: skip index generation when lxml is not available (diff) | |
| download | systemd-9ac47f38151808712f1bdcae8e2eb42a0b53e5ca.tar.gz systemd-9ac47f38151808712f1bdcae8e2eb42a0b53e5ca.tar.bz2 systemd-9ac47f38151808712f1bdcae8e2eb42a0b53e5ca.zip | |
meson: fix condition for installation of .in units, 99-default.link
The condition to install in_units was calculated, but not used.
99-default.link should be installed uncoditionally.
| -rw-r--r-- | network/meson.build | 4 | ||||
| -rw-r--r-- | units/meson.build | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/network/meson.build b/network/meson.build index d36aadb9d..4cca408c7 100644 --- a/network/meson.build +++ b/network/meson.build @@ -4,9 +4,11 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 install_data('80-container-host0.network', '80-container-ve.network', '80-container-vz.network', - '99-default.link', install_dir : networkdir) meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) endif + +install_data('99-default.link', + install_dir : networkdir) diff --git a/units/meson.build b/units/meson.build index e49a293ba..37903e45c 100644 --- a/units/meson.build +++ b/units/meson.build @@ -255,7 +255,7 @@ foreach tuple : in_units output : file, command : [sed, '/^## /d', '@INPUT@'], capture : true, - install : true, + install : install, install_dir : systemunitdir) if install and tuple.length() > 2 |