From 2d02719c2bcf8b5e30228e00eaceae91946c7551 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Apr 2010 22:18:55 +0200
Subject: [PATCH] units: fix logger/initctl paths

---
 Makefile.am                      | 8 ++++++--
 socket.c                         | 1 -
 units/systemd-initctl.service.in | 2 +-
 units/systemd-logger.service.in  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7afa2f157..d08644a6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,10 +246,14 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile
-	sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+	sed -e 's,@libexecdir\@,$(libexecdir),g' \
+		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+		< $< > $@
 
 systemd-logger.service: units/systemd-logger.service.in Makefile
-	sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+	sed -e 's,@libexecdir\@,$(libexecdir),g' \
+		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+		< $< > $@
 
 CLEANFILES = \
 	systemd-interfaces.c \
diff --git a/socket.c b/socket.c
index cb065b75b..6d15cfe0e 100644
--- a/socket.c
+++ b/socket.c
@@ -1110,7 +1110,6 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
                 }
         }
 
-        log_debug("cfd=%i", cfd);
         socket_enter_running(s, cfd);
         return;
 
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 268cd9cf1..4fce84783 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -2,5 +2,5 @@
 Description=systemd /dev/initctl Compatibility
 
 [Service]
-ExecStart=@libexecdir@/systemd-initctl
+ExecStart=@pkglibexecdir@/systemd-initctl
 Type=simple
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index fd0621abe..55f3841ed 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -2,5 +2,5 @@
 Description=systemd Logging Daemon
 
 [Service]
-ExecStart=@libexecdir@/systemd-logger
+ExecStart=@pkglibexecdir@/systemd-logger
 Type=simple
-- 
2.30.2