Package: powerman / 2.4.4-4

usrmerge.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
From: Helmut Grohne <helmut@subdivi.de>
Date: Wed, 11 Sep 2024 21:28:55 -0400
Subject: fix computation of with_systemdsystemunitdir

The value for systemdsystemunitdir reported by systemd.pc already accounts for
${prefix} and will include it in future. Thus the current value would install a
unit into /usr/usr/lib/systemd/system which is not what we want.
---
 config/systemd.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/systemd.m4 b/config/systemd.m4
index 05e7c29..98e1cc7 100644
--- a/config/systemd.m4
+++ b/config/systemd.m4
@@ -33,7 +33,7 @@ AC_DEFUN([RRA_WITH_SYSTEMD_UNITDIR],
     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
         [Directory for systemd service files])],
     [],
-    [with_systemdsystemunitdir=\${prefix}$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+    [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
  AS_IF([test x"$with_systemdsystemunitdir" != xno],
     [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
  AM_CONDITIONAL([HAVE_SYSTEMD],