mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
From cd5b1075499b8498d9c700a317ad11a3199c447a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
Date: Sun, 6 Dec 2020 08:34:19 +0100
|
|
Subject: [PATCH 19/19] Revert "pkg-config: prefix is not really configurable,
|
|
don't pretend it was"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This reverts commit 6e65df89c348242dbd10036abc7dd5e8181cf733.
|
|
|
|
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
|
---
|
|
src/core/systemd.pc.in | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
|
|
index ccb382e421..8a35e53a4a 100644
|
|
--- 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
|
|
+prefix=@prefix@
|
|
root_prefix=@rootprefix_noslash@
|
|
rootprefix=${root_prefix}
|
|
sysconf_dir=@sysconfdir@
|
|
@@ -26,10 +26,10 @@ systemdsystemunitdir=${systemd_system_unit_dir}
|
|
systemd_system_preset_dir=${rootprefix}/lib/systemd/system-preset
|
|
systemdsystempresetdir=${systemd_system_preset_dir}
|
|
|
|
-systemd_user_unit_dir=/usr/lib/systemd/user
|
|
+systemd_user_unit_dir=${prefix}/lib/systemd/user
|
|
systemduserunitdir=${systemd_user_unit_dir}
|
|
|
|
-systemd_user_preset_dir=/usr/lib/systemd/user-preset
|
|
+systemd_user_preset_dir=${prefix}/lib/systemd/user-preset
|
|
systemduserpresetdir=${systemd_user_preset_dir}
|
|
|
|
systemd_system_conf_dir=${sysconfdir}/systemd/system
|
|
@@ -48,7 +48,7 @@ systemduserunitpath=${systemd_user_unit_path}
|
|
systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
|
|
systemdsystemgeneratordir=${systemd_system_generator_dir}
|
|
|
|
-systemd_user_generator_dir=/usr/lib/systemd/user-generators
|
|
+systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
|
|
systemdusergeneratordir=${systemd_user_generator_dir}
|
|
|
|
systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir}
|
|
@@ -63,7 +63,7 @@ systemdsleepdir=${systemd_sleep_dir}
|
|
systemd_shutdown_dir=${root_prefix}/lib/systemd/system-shutdown
|
|
systemdshutdowndir=${systemd_shutdown_dir}
|
|
|
|
-tmpfiles_dir=/usr/lib/tmpfiles.d
|
|
+tmpfiles_dir=${prefix}/lib/tmpfiles.d
|
|
tmpfilesdir=${tmpfiles_dir}
|
|
|
|
sysusers_dir=${rootprefix}/lib/sysusers.d
|
|
@@ -78,7 +78,7 @@ binfmtdir=${binfmt_dir}
|
|
modules_load_dir=${rootprefix}/lib/modules-load.d
|
|
modulesloaddir=${modules_load_dir}
|
|
|
|
-catalog_dir=/usr/lib/systemd/catalog
|
|
+catalog_dir=${prefix}/lib/systemd/catalog
|
|
catalogdir=${catalog_dir}
|
|
|
|
system_uid_max=@SYSTEM_UID_MAX@
|
|
--
|
|
2.29.2
|
|
|