diff options
| author | Mike Yuan <me@yhndnzj.com> | 2024-11-13 22:23:40 +0100 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2024-11-13 22:51:27 +0100 |
| commit | 1c03fda52efb580a14c3a143025ec123f662d303 (patch) | |
| tree | 5f5e41bdee1e0df375d2ec686655e3b35c3b0e91 /tmpfiles.d/meson.build | |
| parent | namespace-util: pin pid via pidfd during namespace_open() (diff) | |
| download | systemd-1c03fda52efb580a14c3a143025ec123f662d303.tar.xz systemd-1c03fda52efb580a14c3a143025ec123f662d303.zip | |
tmpfiles.d/meson: call subdir_done() early if tmpfiles is disabled
Diffstat (limited to '')
| -rw-r--r-- | tmpfiles.d/meson.build | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index 52611357c2..43a9232ca4 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -1,6 +1,8 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1 +if conf.get('ENABLE_TMPFILES') != 1 + subdir_done() +endif files = [['README', ''], ['home.conf', ''], @@ -19,9 +21,7 @@ files = [['README', ''], ] foreach pair : files - if not enable_tmpfiles - # do nothing - elif pair[1] == '' or conf.get(pair[1]) == 1 + if pair[1] == '' or conf.get(pair[1]) == 1 install_data(pair[0], install_dir : tmpfilesdir) else message('Not installing tmpfiles.d/@0@ because @1@ is @2@' @@ -42,15 +42,13 @@ in_files = [ ] foreach pair : in_files - if not enable_tmpfiles - # do nothing - elif pair[1] == '' or conf.get(pair[1]) == 1 + if pair[1] == '' or conf.get(pair[1]) == 1 custom_target( pair[0], input : pair[0] + '.in', output: pair[0], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], - install : enable_tmpfiles, + install : true, install_dir : tmpfilesdir) else message('Not installing tmpfiles.d/@0@ because @1@ is @2@' @@ -58,6 +56,6 @@ foreach pair : in_files endif endforeach -if enable_tmpfiles and install_sysconfdir +if install_sysconfdir install_emptydir(sysconfdir / 'tmpfiles.d') endif |