unit: ship default.service for sessions by default

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 65ab1339a7dde132a5aef3b2ba649088b89dd7cd..6d860ec95cf52a92638c429ddfb10624530271f6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,16 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
-       units/systemd-logger.socket
+       units/systemd-logger.socket \
+       units/dev-hugepages.automount \
+       units/dev-hugepages.mount \
+       units/dev-mqueue.automount \
+       units/dev-mqueue.mount \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount \
+       units/sys-kernel-debug.automount \
+       units/sys-kernel-debug.mount \
+       units/var-run.mount
 
 systemunit_DATA = \
        units/basic.target \
@@ -93,6 +102,9 @@ systemunit_DATA = \
        units/systemd-logger.service \
        units/syslog.target
 
+dist_sessionunit_DATA = \
+       units/session/default.target
+
 sessionunit_DATA = \
        units/session/remote-fs.target
 
@@ -335,9 +347,6 @@ units/session/%: units/%.m4 Makefile
        $(M4_PROCESS_SESSION)
 
 CLEANFILES = \
-       src/systemd-interfaces.c \
-       src/systemctl.c \
-       src/systemadm.c \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/syslog.target \
@@ -350,6 +359,13 @@ CLEANFILES = \
        man/systemd.special.7 \
        man/systemd.special.html
 
+if HAVE_VALAC
+CLEANFILES += \
+       src/systemd-interfaces.c \
+       src/systemctl.c \
+       src/systemadm.c
+endif
+
 if HAVE_XSLTPROC
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -400,6 +416,7 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
+               $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
@@ -447,6 +464,12 @@ install-data-hook:
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f getty.target && \
                $(LN_S) $(systemunitdir)/getty.target getty.target )
+       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+               rm -f dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.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 )
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
                rm -f prefdm.service && \
@@ -457,6 +480,8 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
+       ( cd $(DESTDIR)/etc/init.d && \
+               $(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \