From: Luca Boccassi <bluca@debian.org>
Date: Mon, 6 Nov 2023 12:40:37 +0000 (+0000)
Subject: pkgconfig: keep unmerged paths for udevdir and systemdsystemunitdir
X-Git-Tag: archive/raspbian/255.3-1+rpi1~2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4a1595aabbe27195fd1b7c3d43b7a4ea14505692;p=systemd.git

pkgconfig: keep unmerged paths for udevdir and systemdsystemunitdir

We are not ready to rebuild all packages installing system
units and udev rules to /usr/lib, so keep the old paths
for a while longer

Gbp-Pq: Topic debian
Gbp-Pq: Name pkgconfig-keep-unmerged-paths-for-udevdir-and-systemdsyst.patch
---

diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index f3b85b01..5482ec26 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -25,7 +25,7 @@ sysconfdir=${sysconf_dir}
 systemd_util_dir=${prefix}/lib/systemd
 systemdutildir=${systemd_util_dir}
 
-systemd_system_unit_dir=${prefix}/lib/systemd/system
+systemd_system_unit_dir=/lib/systemd/system
 systemdsystemunitdir=${systemd_system_unit_dir}
 
 systemd_system_preset_dir=${prefix}/lib/systemd/system-preset
diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in
index cbf76939..d731642e 100644
--- a/src/udev/udev.pc.in
+++ b/src/udev/udev.pc.in
@@ -11,5 +11,5 @@ Name: udev
 Description: udev
 Version: {{PROJECT_VERSION}}
 
-udev_dir={{UDEVLIBEXECDIR}}
+udev_dir=/lib/udev
 udevdir=${udev_dir}