X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=122acfad9002dbb0e7b34752b9e7c57267d7d5e4;hb=cabca20b1abe646cd57655effbc3a0516b78797f;hp=fbf23587bc791820664ab41885d368afb3c34c76;hpb=83684a3553cd875d6873b3dc867e6cd1a7cc4173;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index fbf23587b..122acfad9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@ AM_CPPFLAGS = \
 	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
 	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
 	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
@@ -546,7 +546,8 @@ libsystemd_core_la_CFLAGS = \
 	$(UDEV_CFLAGS) \
 	$(LIBWRAP_CFLAGS) \
 	$(PAM_CFLAGS) \
-	$(AUDIT_CFLAGS)
+	$(AUDIT_CFLAGS) \
+	$(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
 	libsystemd-basic.la \
@@ -555,7 +556,8 @@ libsystemd_core_la_LIBADD = \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS) \
-	$(CAP_LIBS)
+	$(CAP_LIBS) \
+	$(KMOD_LIBS)
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.	We therefore can't
@@ -728,12 +730,10 @@ systemd_SOURCES = \
 systemd_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(UDEV_CFLAGS) \
-	$(KMOD_CFLAGS)
+	$(UDEV_CFLAGS)
 
 systemd_LDADD = \
-	libsystemd-core.la \
-	$(KMOD_LIBS)
+	libsystemd-core.la
 
 test_engine_SOURCES = \
 	src/test-engine.c