execute: support minimal environment variable replacement when executing processes

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fd02db3d096be804ec8c6596cdeae32591deb5b7..dfea23df4f0c09e863ca3dbbe14172d5d36c0767 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
 
@@ -306,7 +311,8 @@ EXTRA_DIST += \
        src/initreq.h \
        src/sd-daemon.h \
        src/special.h \
-       src/dbus-common.h
+       src/dbus-common.h \
+       src/bus-errors.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -336,7 +342,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 \
@@ -447,7 +454,8 @@ systemd_logger_LDADD = \
 
 systemd_initctl_SOURCES = \
        src/initctl.c \
-       src/sd-daemon.c
+       src/sd-daemon.c \
+       src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
        $(AM_CFLAGS) \