pkgconfig,rpm: expose vars for user-tmpfiles.d location

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2098553.

diff --git a/meson.build b/meson.build
index 4f33323a342a326f67fef1717481df574e823e6c..c48b3b31ca1c38975110eb49129ad9d45e965c9f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -175,6 +175,7 @@ pkgsysconfdir = sysconfdir / 'systemd'
 userunitdir = prefixdir / 'lib/systemd/user'
 userpresetdir = prefixdir / 'lib/systemd/user-preset'
 tmpfilesdir = prefixdir / 'lib/tmpfiles.d'
+usertmpfilesdir = prefixdir / 'share/user-tmpfiles.d'
 sysusersdir = prefixdir / 'lib/sysusers.d'
 sysctldir = prefixdir / 'lib/sysctl.d'
 binfmtdir = prefixdir / 'lib/binfmt.d'
@@ -287,6 +288,7 @@ conf.set_quoted('SYSTEM_SYSVINIT_PATH',                       sysvinit_path)
 conf.set_quoted('SYSTEM_SYSVRCND_PATH',                       sysvrcnd_path)
 conf.set_quoted('SYSUSERS_DIR',                               sysusersdir)
 conf.set_quoted('TMPFILES_DIR',                               tmpfilesdir)
+conf.set_quoted('USER_TMPFILES_DIR',                          usertmpfilesdir)
 conf.set_quoted('UDEVLIBEXECDIR',                             udevlibexecdir)
 conf.set_quoted('UDEV_HWDB_DIR',                              udevhwdbdir)
 conf.set_quoted('UDEV_RULES_DIR',                             udevrulesdir)

diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index fc0f8c34fac4106cc445f4cfd3d88e9583a16961..693433b34b87a3afba0068f85d73e33a165f2a2e 100644 (file)
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -65,6 +65,8 @@ systemdshutdowndir=${systemd_shutdown_dir}
 tmpfiles_dir=${prefix}/lib/tmpfiles.d
 tmpfilesdir=${tmpfiles_dir}
 
+user_tmpfiles_dir=${prefix}/share/user-tmpfiles.d
+
 sysusers_dir=${rootprefix}/lib/sysusers.d
 sysusersdir=${sysusers_dir}
 

diff --git a/src/rpm/macros.systemd.in b/src/rpm/macros.systemd.in
index caa2e45595058e0a24d825112d4885bb3ce74c1e..8880078b1b3cbe5aa7cbdc61fc86244e4b32e602 100644 (file)
--- a/src/rpm/macros.systemd.in
+++ b/src/rpm/macros.systemd.in
@@ -17,6 +17,7 @@
 %_sysctldir {{SYSCTL_DIR}}
 %_sysusersdir {{SYSUSERS_DIR}}
 %_tmpfilesdir {{TMPFILES_DIR}}
+%_user_tmpfilesdir {{USER_TMPFILES_DIR}}
 %_environmentdir {{ENVIRONMENT_DIR}}
 %_modulesloaddir {{MODULESLOAD_DIR}}
 %_modprobedir {{MODPROBE_DIR}}