X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a15777e36fce570c899f130beba28db994a3348b;hp=a96b89d6182271dc94e85f4f43ee624a4bda2197;hb=c87eba546a33ce7ecd66f0e3b61bdf55ae1389f0;hpb=683f468c54a81fd4084a2ba1082025959cd3c7d1 diff --git a/Makefile.am b/Makefile.am index a96b89d61..a15777e36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,7 +128,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 +140,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 +361,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 +395,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 +538,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)