dbus: send reload completion message on right connection

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4e4fd52081abd0e357d1e1badf11ab4bbc676ec0..0215f2325d14ce1ef081c11b0855eea26897a333 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,10 +38,12 @@ systemunitdir=$(rootdir)/lib/systemd/system
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
+       -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
        -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+       -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
        -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
        -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
        -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
@@ -81,6 +83,9 @@ pamlib_LTLIBRARIES = \
        pam_systemd.la
 endif
 
+dist_pkgsysconf_DATA = \
+       src/system.conf
+
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf
 
@@ -267,6 +272,7 @@ libsystemd_core_la_SOURCES = \
        src/hostname-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
+       src/modprobe-setup.c \
        src/utmp-wtmp.c \
        src/specifier.c \
        src/unit-name.c \
@@ -335,7 +341,8 @@ MANPAGES = \
        man/telinit.8 \
        man/halt.8 \
        man/shutdown.8 \
-       man/pam_systemd.8
+       man/pam_systemd.8 \
+       man/systemd.conf.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \