2021-12-06 16:07:01 +00:00
|
|
|
From 7654964344ba083529cb232ab229db7c0888f782 Mon Sep 17 00:00:00 2001
|
2021-04-12 18:23:04 +00:00
|
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
|
|
|
Date: Sun, 6 Dec 2020 08:34:19 +0100
|
2021-12-06 16:07:01 +00:00
|
|
|
Subject: [PATCH 18/21] pkg-config: derive prefix from --prefix
|
2021-04-12 18:23:04 +00:00
|
|
|
|
|
|
|
|
Point prefix to the one configured, instead of `/usr` `systemd` has limited
|
|
|
|
|
support for making the pkgconfig prefix overridable, and interpolates those
|
|
|
|
|
values later down.
|
|
|
|
|
|
|
|
|
|
So we only need to patch this one value to get the correct paths.
|
|
|
|
|
See systemd/systemd@bc4e6e27922a2873985ab9367d79fb099f70b505 for details.
|
|
|
|
|
|
|
|
|
|
Co-Authored-By: Florian Klink <flokli@flokli.de>
|
|
|
|
|
---
|
|
|
|
|
src/core/systemd.pc.in | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
|
2021-12-06 16:07:01 +00:00
|
|
|
index 162432e77f..2fc20daf03 100644
|
2021-04-12 18:23:04 +00:00
|
|
|
--- a/src/core/systemd.pc.in
|
|
|
|
|
+++ b/src/core/systemd.pc.in
|
|
|
|
|
@@ -11,7 +11,7 @@
|
|
|
|
|
# considered deprecated (though there is no plan to remove them). New names
|
|
|
|
|
# shall have underscores.
|
|
|
|
|
|
|
|
|
|
-prefix=/usr
|
2021-09-26 12:46:18 +00:00
|
|
|
+prefix={{PREFIX}}
|
|
|
|
|
root_prefix={{ROOTPREFIX_NOSLASH}}
|
2021-04-12 18:23:04 +00:00
|
|
|
rootprefix=${root_prefix}
|
2021-09-26 12:46:18 +00:00
|
|
|
sysconf_dir={{SYSCONF_DIR}}
|
2021-04-12 18:23:04 +00:00
|
|
|
--
|
2021-12-06 16:07:01 +00:00
|
|
|
2.33.0
|
2021-04-12 18:23:04 +00:00
|
|
|
|
