units: fix logger/initctl paths

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 \

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;
 

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

units/systemd-logger.service.in

@@ -2,5 +2,5 @@
 Description=systemd Logging Daemon
 
 [Service]
-ExecStart=@libexecdir@/systemd-logger
+ExecStart=@pkglibexecdir@/systemd-logger
 Type=simple