ACLOCAL_AMFLAGS = -I m4
+# Dirs of external packages
dbuspolicydir=$(sysconfdir)/dbus-1/system.d
udevrulesdir=@udevrulesdir@
+interfacedir=$(datadir)/dbus-1/interfaces
+# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
-systemunitdir=$(pkgdatadir)/system
sessionunitdir=$(pkgdatadir)/session
-interfacedir=$(datadir)/dbus-1/interfaces
+
+# And these are the special ones for /
+rootdir=@rootdir@
+rootbindir=$(rootdir)/bin
+rootlibexecdir=$(rootdir)/lib/systemd
+systemunitdir=$(rootdir)/lib/systemd/system
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
- -DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
- -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\" \
+ -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+ -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-I $(top_srcdir)/src
-sbin_PROGRAMS = \
- systemd
-
-bin_PROGRAMS = \
+rootbin_PROGRAMS = \
+ systemd \
systemctl
if HAVE_GTK
-bin_PROGRAMS += \
+bin_PROGRAMS = \
systemadm
endif
-pkglibexec_PROGRAMS = \
+rootlibexec_PROGRAMS = \
systemd-logger \
systemd-cgroups-agent \
systemd-initctl
org.freedesktop.systemd1.Mount.xml \
org.freedesktop.systemd1.Automount.xml \
org.freedesktop.systemd1.Snapshot.xml \
- org.freedesktop.systemd1.Swap.xml
+ org.freedesktop.systemd1.Swap.xml \
+ org.freedesktop.systemd1.Path.xml
dist_systemunit_DATA = \
units/emergency.service \
units/local-fs.target \
units/network.target \
units/nss-lookup.target \
+ units/mail-transfer-agent.target \
units/poweroff.target \
units/reboot.target \
units/remote-fs.target \
units/dev-mqueue.mount \
units/proc-sys-fs-binfmt_misc.automount \
units/proc-sys-fs-binfmt_misc.mount \
- units/sys-fs-fuse-connections.automount \
- units/sys-fs-fuse-connections.mount \
units/sys-kernel-debug.automount \
units/sys-kernel-debug.mount \
units/sys-kernel-security.automount \
units/session/default.target
sessionunit_DATA = \
- units/session/remote-fs.target
+ units/session/remote-fs.target \
+ units/session/exit.service
EXTRA_DIST = \
units/basic.target.m4 \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
units/syslog.target.in \
+ units/session/exit.service.in \
LICENSE \
README \
DISTRO_PORTING
units/fedora/sysinit.service
endif
+if TARGET_SUSE
+dist_systemunit_DATA += \
+ units/suse/halt.service \
+ units/suse/poweroff.service \
+ units/suse/reboot.service
+endif
+
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/halt.service \
src/snapshot.c \
src/socket.c \
src/timer.c \
+ src/path.c \
src/load-dropin.c \
src/execute.c \
src/dbus.c \
src/dbus-snapshot.c \
src/dbus-device.c \
src/dbus-execute.c \
+ src/dbus-path.c \
src/cgroup.c \
src/mount-setup.c \
src/hostname-setup.c \
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
- src/test-engine.c
+ src/test-job-type.c
test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
test_job_type_LDADD = $(systemd_LDADD)
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
- -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+ -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
+ -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
< $< > $@
units/%: units/%.in Makefile
units/multi-user.target \
units/remote-fs.target \
units/session/remote-fs.target \
+ units/session/exit.service \
man/systemd.special.7 \
man/systemd.special.html
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
( cd $(DESTDIR)$(sessionunitdir) && \
rm -f shutdown.target sockets.target local-fs.target swap.target && \
- $(LN_S) ../system/shutdown.target shutdown.target && \
- $(LN_S) ../system/sockets.target sockets.target && \
- $(LN_S) ../system/local-fs.target local-fs.target && \
- $(LN_S) ../system/swap.target swap.target )
+ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
+ $(LN_S) $(systemunitdir)/sockets.target sockets.target && \
+ $(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
+ $(LN_S) $(systemunitdir)/swap.target swap.target )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel0.target runlevel1.target runlevel6.target && \
$(LN_S) poweroff.target runlevel0.target && \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
sys-kernel-debug.automount \
- sys-fs-fuse-connections.automount \
sys-kernel-security.automount && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
- $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
- $(LN_S) ../sys-fs-fuse-connections.automount sys-fs-fuse-connections.automount )
+ $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
if TARGET_FEDORA
+ ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+ rm -f display-manager.service && \
+ $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
- rm -f prefdm.service && \
- $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
+ rm -f display-manager.service && \
+ $(LN_S) ../display-manager.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
( cd $(DESTDIR)/etc/init.d && \
$(LN_S) halt reboot > /dev/null 2>&1 || true )
endif
+if TARGET_GENTOO
+ ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+ rm -f display-manager.service && \
+ $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
+ ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
+ rm -f display-manager.service && \
+ $(LN_S) ../display-manager.service display-manager.service )
+endif
DISTCHECK_CONFIGURE_FLAGS = \
- --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
+ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
+ --with-rootdir=$$dc_install_base/$(rootdir)
~ianmdlvl / elogind.git / blobdiff