]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: Ensure that distribution packages own systemenvgeneratordir
authorDebarshi Ray <debarshir@gnome.org>
Fri, 2 May 2025 19:08:55 +0000 (21:08 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 5 May 2025 15:12:02 +0000 (00:12 +0900)
Currently, Fedora's systemd RPM doesn't own systemenvgeneratordir
(ie., /usr/lib/systemd/system-environment-generators) [1] because it's
not created when systemd is installed.  In contrast, userenvgeneratordir
(ie., /usr/lib/systemd/user-environment-generators) is created, unless
the environment-d Meson option is explicitly disabled.

While this can be worked around elsewhere, it's better if the upstream
build system created the directories consistently.  It will avoid
repetition, and prevent silly bugs or deviations from creeping in.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=2284085

src/core/meson.build

index 2fd6e0fbc3ef7298620287b3869813c3dfde1326..7f40b026c18592b01d2f185d3a959b35f1b450fc 100644 (file)
@@ -253,9 +253,11 @@ install_data('org.freedesktop.systemd1.conf',
 install_data('org.freedesktop.systemd1.service',
              install_dir : dbussystemservicedir)
 
+install_emptydir(systemenvgeneratordir)
 install_emptydir(systemshutdowndir)
 install_emptydir(systemsleepdir)
 install_emptydir(systemgeneratordir)
+install_emptydir(userenvgeneratordir)
 install_emptydir(usergeneratordir)
 
 if install_sysconfdir