X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=456553fa5e6cc7202feda72b140922d9728f64bc;hp=683376b9208b76e76307f4fe8592adea227e31fb;hb=2edfa36685588a5e224d1f86b3fcc16c46766fea;hpb=42eacdadf56dfeb32c8cb0f598a47a43e6190483 diff --git a/Makefile.am b/Makefile.am index 683376b92..456553fa5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,6 +163,7 @@ dist_tmpfiles_DATA = \ dist_systemunit_DATA = \ units/emergency.service \ units/emergency.target \ + units/sysinit.target \ units/basic.target \ units/getty.target \ units/halt.target \ @@ -215,7 +216,6 @@ dist_systemunit_DATA = \ units/systemd-ask-password-plymouth.path nodist_systemunit_DATA = \ - units/sysinit.target \ units/getty@.service \ units/serial-getty@.service \ units/graphical.target \ @@ -247,7 +247,8 @@ nodist_systemunit_DATA = \ units/kexec.service \ units/fsck@.service \ units/fsck-root.service \ - units/quotacheck.service + units/quotacheck.service \ + units/rescue.service dist_sessionunit_DATA = \ units/session/default.target \ @@ -258,12 +259,12 @@ nodist_sessionunit_DATA = \ units/session/exit.service EXTRA_DIST = \ - units/sysinit.target.m4 \ units/getty@.service.m4 \ units/serial-getty@.service.m4 \ units/graphical.target.m4 \ units/multi-user.target.m4 \ units/remote-fs.target.m4 \ + units/rescue.service.m4 \ units/systemd-initctl.service.in \ units/systemd-logger.service.in \ units/systemd-shutdownd.service.in \ @@ -299,8 +300,8 @@ dist_systemunit_DATA += \ units/fedora/prefdm.service \ units/fedora/rc-local.service \ units/fedora/halt-local.service \ - units/fedora/single.service \ units/fedora/plymouth-start.service \ + units/fedora/plymouth-read-write.service \ units/fedora/plymouth-quit.service \ units/fedora/plymouth-reboot.service \ units/fedora/plymouth-kexec.service \ @@ -485,7 +486,8 @@ MANPAGES = \ man/halt.8 \ man/shutdown.8 \ man/pam_systemd.8 \ - man/systemd.conf.5 + man/systemd.conf.5 \ + man/tmpfiles.d.5 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -924,7 +926,7 @@ SED_PROCESS = \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ -e 's,@prefix\@,$(prefix),g' \ - < $< > $@ + < $< > $@ || rm $@ units/%: units/%.in Makefile $(SED_PROCESS) @@ -937,11 +939,11 @@ man/%: man/%.in Makefile M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ + $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@ M4_PROCESS_SESSION = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@ + $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@ || rm $@ units/%: units/%.m4 Makefile $(M4_PROCESS_SYSTEM) @@ -1176,7 +1178,6 @@ if TARGET_FEDORA $(DESTDIR)$(systemunitdir)/kexec.target.wants \ $(DESTDIR)$(systemunitdir)/poweroff.target.wants \ $(DESTDIR)$(systemunitdir)/halt.target.wants \ - $(DESTDIR)$(systemunitdir)/rescue.target.wants \ $(DESTDIR)$(systemunitdir)/final.target.wants ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ rm -f rc-local.service && \ @@ -1184,16 +1185,14 @@ if TARGET_FEDORA ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ rm -f halt-local.service && \ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) - ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \ - rm -f single.service && \ - $(LN_S) $(systemunitdir)/single.service single.service ) - ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ - rm -f plymouth-quit.service && \ - $(LN_S) ../plymouth-quit.service plymouth-quit.service ) ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ - rm -f plymouth-start.service systemd-ask-password-plymouth.path && \ + rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \ $(LN_S) ../plymouth-start.service plymouth-start.service && \ + $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \ $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path ) + ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ + rm -f plymouth-quit.service && \ + $(LN_S) ../plymouth-quit.service plymouth-quit.service ) ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \ rm -f plymouth-reboot.service && \ $(LN_S) ../plymouth-reboot.service plymouth-reboot.service ) @@ -1255,5 +1254,3 @@ git-tag: fedora: install rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount - sed -i -e 's/^#MountAuto=yes$$/MountAuto=no/' \ - -e 's/^#SwapAuto=yes$$/SwapAuto=no/' $(DESTDIR)/etc/systemd/system.conf