From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 2 Jun 2010 13:51:38 +0000 (+0200)
Subject: untis: fix path to helper services
X-Git-Tag: 0.git+20100605+dfd8ee-1~9^2^2~27
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1136a371e204602a5a4d7cc5870f573bb61ee182;p=systemd

untis: fix path to helper services
---

diff --git a/Makefile.am b/Makefile.am
index d752ec58..2ab79950 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -368,11 +368,10 @@ systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
-		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
 		-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
-		-e 's,@SYSTEMCTL\@,$(bindir)/systemctl,g' \
+		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 283c057c..6c936538 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -11,5 +11,5 @@
 Description=systemd /dev/initctl Compatibility Daemon
 
 [Service]
-ExecStart=@pkglibexecdir@/systemd-initctl
+ExecStart=@rootlibexecdir@/systemd-initctl
 Type=simple
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 39a20013..5fc05320 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -12,5 +12,5 @@ Description=systemd Logging Daemon
 After=@SPECIAL_SYSLOG_SERVICE@
 
 [Service]
-ExecStart=@pkglibexecdir@/systemd-logger
+ExecStart=@rootlibexecdir@/systemd-logger
 Type=simple