X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=8313e57ff7b40060eedc261ffcb0ca6b58ee313e;hb=cd250a39da8d5b9c0d220a07e765064638708fe9;hp=3589b735b0a6cb55d917e0f7624b13b227e6b589;hpb=670802d4b1d16c3785a695bea6e13b8bf8c8a822;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 3589b735b..8313e57ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,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
 
@@ -129,6 +132,15 @@ dist_systemunit_DATA += \
 	units/fedora/sysinit.service
 endif
 
+if TARGET_GENTOO
+dist_systemunit_DATA += \
+	units/gentoo/halt.service \
+	units/gentoo/killall.service \
+	units/gentoo/poweroff.service \
+	units/gentoo/reboot.service \
+	units/gentoo/xdm.service
+endif
+
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
 # list the .h files as dependencies if we want make dist to work.
@@ -416,7 +428,6 @@ install-data-hook:
 		$(DESTDIR)$(systemunitdir)/basic.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system \
 		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
-		$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/session \
@@ -462,9 +473,6 @@ install-data-hook:
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f getty.target && \
 		$(LN_S) $(systemunitdir)/getty.target getty.target )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-		rm -f var-run.mount && \
-		$(LN_S) $(systemunitdir)/var-run.mount var-run.mount )
 	( 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 && \
@@ -481,6 +489,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 = \