]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: fix condition for installation of .in units, 99-default.link
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 14 Apr 2017 00:17:04 +0000 (20:17 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 24 Apr 2017 01:47:28 +0000 (21:47 -0400)
The condition to install in_units was calculated, but not used.

99-default.link should be installed uncoditionally.

network/meson.build
units/meson.build

index d36aadb9dab3a11cdc7258061e2e94eac3e9ae61..4cca408c7f253163d45ab32f924e64ee9e2512be 100644 (file)
@@ -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)
index e49a293ba9f1bf0e205782dbd4337a258a8ca473..37903e45c0717c2f3e1b0f89eca0f51a5fbd9cbc 100644 (file)
@@ -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