units: drop fuse fs from automount, since this is now done by udev internally

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a96b89d6182271dc94e85f4f43ee624a4bda2197..96e145b31d509de2c8b65e9e398595f215fe7b21 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,8 +106,6 @@ dist_systemunit_DATA = \
        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 \
@@ -128,7 +126,8 @@ dist_sessionunit_DATA = \
        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 \
@@ -139,6 +138,7 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/syslog.target.in \
+       units/session/exit.service.in \
        LICENSE \
        README \
        DISTRO_PORTING
@@ -359,6 +359,8 @@ SED_PROCESS = \
        $(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
                -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+               -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
+               -e 's,@SYSTEMCTL\@,$(bindir)/systemctl,g' \
                < $< > $@
 
 units/%: units/%.in Makefile
@@ -391,6 +393,7 @@ CLEANFILES = \
        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
 
@@ -533,6 +536,14 @@ if TARGET_FEDORA
        ( 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)