summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
blob: 0f82819947b79ca9e5d9c7c9be93f3b7924e7624 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From 0ac75fbbf771dfbb368087f19b2ed61356f9367d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 26 Jul 2021 16:57:43 +0200
Subject: [PATCH 19/22] core: respect install_sysconfdir_samples in meson file

The refactoring done in e11a25cadbe caused the configuration files to be
installed into the pkgsysconfdir regardless of the state of the
install_sysconfdir_samples boolean that indicated whether or not the
sample files should be installed.
---
 src/core/meson.build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/meson.build b/src/core/meson.build
index f0d2c6f642..4ff7e00e36 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -187,6 +187,10 @@ foreach item : in_files
         file = item[0]
         dir = item[1]
 
+        if not install_sysconfdir_samples and dir == pkgsysconfdir
+                continue
+        endif
+
         custom_target(
                 file,
                 input : file + '.in',
-- 
2.33.0