ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
Zbigniew Jędrzejewski-Szmek f93a13
From 518d40b992abca8de5b9136e88748783200535da Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek f93a13
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Zbigniew Jędrzejewski-Szmek f93a13
Date: Thu, 23 Nov 2023 00:06:29 +0100
Zbigniew Jędrzejewski-Szmek f93a13
Subject: [PATCH] meson: always install network example files
Zbigniew Jędrzejewski-Szmek f93a13
Zbigniew Jędrzejewski-Szmek f93a13
I started working on integrating this in the Fedora package and realized that
Zbigniew Jędrzejewski-Szmek f93a13
the example files should be installed regardless of the renamed files when
Zbigniew Jędrzejewski-Szmek f93a13
default-network=true is used. This is because the renamed files become part of
Zbigniew Jędrzejewski-Szmek f93a13
a different package, and we want to have the other files which are used as
Zbigniew Jędrzejewski-Szmek f93a13
documentation in the main package anyway.
Zbigniew Jędrzejewski-Szmek f93a13
---
Zbigniew Jędrzejewski-Szmek f93a13
 network/meson.build | 9 ++++-----
Zbigniew Jędrzejewski-Szmek f93a13
 1 file changed, 4 insertions(+), 5 deletions(-)
Zbigniew Jędrzejewski-Szmek f93a13
Zbigniew Jędrzejewski-Szmek f93a13
diff --git a/network/meson.build b/network/meson.build
Zbigniew Jędrzejewski-Szmek f93a13
index 4f17f7385e..2a472f4f51 100644
Zbigniew Jędrzejewski-Szmek f93a13
--- a/network/meson.build
Zbigniew Jędrzejewski-Szmek f93a13
+++ b/network/meson.build
Zbigniew Jędrzejewski-Szmek f93a13
@@ -18,6 +18,10 @@ if conf.get('ENABLE_NETWORKD') == 1
Zbigniew Jędrzejewski-Szmek f93a13
                 '80-wifi-station.network.example',
Zbigniew Jędrzejewski-Szmek f93a13
         )
Zbigniew Jędrzejewski-Szmek f93a13
 
Zbigniew Jędrzejewski-Szmek f93a13
+        install_data(
Zbigniew Jędrzejewski-Szmek f93a13
+                example_network_files,
Zbigniew Jędrzejewski-Szmek f93a13
+                install_dir : networkdir)
Zbigniew Jędrzejewski-Szmek f93a13
+
Zbigniew Jędrzejewski-Szmek f93a13
         if get_option('default-network')
Zbigniew Jędrzejewski-Szmek f93a13
                 foreach f : example_network_files
Zbigniew Jędrzejewski-Szmek f93a13
                         install_data(
Zbigniew Jędrzejewski-Szmek f93a13
@@ -25,12 +29,7 @@ if conf.get('ENABLE_NETWORKD') == 1
Zbigniew Jędrzejewski-Szmek f93a13
                                 rename : fs.replace_suffix(fs.name(f), ''),
Zbigniew Jędrzejewski-Szmek f93a13
                                 install_dir : networkdir)
Zbigniew Jędrzejewski-Szmek f93a13
                 endforeach
Zbigniew Jędrzejewski-Szmek f93a13
-        else
Zbigniew Jędrzejewski-Szmek f93a13
-                install_data(
Zbigniew Jędrzejewski-Szmek f93a13
-                        example_network_files,
Zbigniew Jędrzejewski-Szmek f93a13
-                        install_dir : networkdir)
Zbigniew Jędrzejewski-Szmek f93a13
         endif
Zbigniew Jędrzejewski-Szmek f93a13
-
Zbigniew Jędrzejewski-Szmek f93a13
 endif
Zbigniew Jędrzejewski-Szmek f93a13
 
Zbigniew Jędrzejewski-Szmek f93a13
 install_data('99-default.link',