From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 26 Jul 2021 14:57:43 +0000 (+0200)
Subject: core: respect install_sysconfdir_samples in meson file
X-Git-Tag: v250-rc1~787^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfd760b6a77808d0b9451ed618a23b6259fe525f;p=thirdparty%2Fsystemd.git

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 indicates whether or not the
sample files should be installed.
---

diff --git a/src/core/meson.build b/src/core/meson.build
index 1c364a53e2d..728e2f08076 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -195,7 +195,7 @@ foreach item : in_files
                 output: file,
                 command : [meson_render_jinja2, config_h, '@INPUT@'],
                 capture : true,
-                install : dir != 'no',
+                install : (dir == pkgsysconfdir and install_sysconfdir_samples) or (dir != pkgsysconfdir and dir != 'no'),
                 install_dir : dir)
 endforeach