]> 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)
committerLuca Boccassi <luca.boccassi@gmail.com>
Sat, 17 May 2025 11:43:20 +0000 (12:43 +0100)
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

(cherry picked from commit ab46feb3e28eee0b9be3dece49f5e4c63f21dc37)
(cherry picked from commit bd27edd3de9b3b30f7225994a799e46fba930568)

src/core/meson.build

index dbeb752977c806feb50961997ed2a392cbbf866d..0b336a78de8258ef1effa31e31dfd8cb54498088 100644 (file)
@@ -247,9 +247,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