From 9ac47f38151808712f1bdcae8e2eb42a0b53e5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 13 Apr 2017 20:17:04 -0400 Subject: [PATCH] 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. --- network/meson.build | 4 +++- units/meson.build | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/network/meson.build b/network/meson.build index d36aadb9da..4cca408c7f 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 e49a293ba9..37903e45c0 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