X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b6041b5d1cff7fc96dbbcc4aefc8ea901a20f48d;hp=3c54043975133efb0eb1808be19043d54e0f0f61;hb=3454f9e519260c1b9908dda23870a6c6cdd79f22;hpb=922cc0011979f8eda0f8b07f76bca744f50f0e31 diff --git a/Makefile.am b/Makefile.am index 3c5404397..b6041b5d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -188,7 +188,9 @@ dist_systemunit_DATA += \ units/fedora/rc-local.service \ units/fedora/reboot.service \ units/fedora/sysinit.service \ - units/fedora/single.service + units/fedora/single.service \ + units/fedora/plymouth-quit.service \ + units/fedora/plymouth-shutdown.service endif if TARGET_SUSE @@ -479,7 +481,8 @@ systemd_initctl_LDADD = \ $(DBUS_LIBS) systemd_cgroups_agent_SOURCES = \ - src/cgroups-agent.c + src/cgroups-agent.c \ + src/dbus-common.c systemd_cgroups_agent_CFLAGS = \ $(AM_CFLAGS) \ @@ -761,7 +764,8 @@ install-data-hook: if TARGET_FEDORA $(MKDIR_P) -m 0755 \ $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \ - $(DESTDIR)$(systemunitdir)/rescue.target.wants + $(DESTDIR)$(systemunitdir)/rescue.target.wants \ + $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ rm -f display-manager.service && \ $(LN_S) $(systemunitdir)/prefdm.service display-manager.service ) @@ -769,11 +773,15 @@ if TARGET_FEDORA rm -f prefdm.service && \ $(LN_S) $(systemunitdir)/prefdm.service prefdm.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ - rm -f rc-local.service && \ - $(LN_S) $(systemunitdir)/rc-local.service rc-local.service ) + rm -f rc-local.service plymouth-quit.service && \ + $(LN_S) $(systemunitdir)/rc-local.service rc-local.service && \ + $(LN_S) $(systemunitdir)/plymouth-quit.service plymouth-quit.service ) ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \ rm -f single.service && \ $(LN_S) $(systemunitdir)/single.service single.service ) + ( cd $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants && \ + rm -f plymouth-shutdown.service && \ + $(LN_S) $(systemunitdir)/plymouth-shutdown.service plymouth-shutdown.service ) ( cd $(DESTDIR)$(systemunitdir) && \ rm -f local.service && \ $(LN_S) rc-local.service local.service )