diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-21 15:06:40 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-21 15:06:40 -0300 |
commit | 2fb1be996d4d8d459f4b4953a84af63f981b0bf0 (patch) | |
tree | f168040a0fc7e8e61c93197354938d95454e12a9 /Makefile | |
parent | abbce1c6720dc3836c1df1337a49768158dff62b (diff) | |
parent | 7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 (diff) |
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.08.21
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -32,14 +32,16 @@ install: installdirs doc install -m755 -t $(DESTDIR)/usr/sbin rc.d install -m644 -t $(DESTDIR)/usr/share/man/man5 rc.conf.5 install -m644 -t $(DESTDIR)/usr/share/man/man7 parabola.7 - install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.8 + install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.8 arch-modules-load.8 arch-daemons.8 install -m755 -t $(DESTDIR)/usr/lib/systemd/system-generators arch-daemons install -m755 -t $(DESTDIR)/usr/lib/systemd arch-modules-load - install -m644 -t $(DESTDIR)/usr/lib/systemd/system arch-modules-load.service rc-local.service rc-local-shutdown.service + install -m644 -t $(DESTDIR)/usr/lib/systemd/system arch-modules-load.service rc-local.service rc-local-shutdown.service arch-daemons.target install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/initscripts.conf install -m644 -T bash-completion $(DESTDIR)/usr/share/bash-completion/completions/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d + ln -s /dev/null ${DESTDIR}/usr/lib/systemd/system/netfs.service ln -s ../rc-local.service ${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/ + ln -s ../arch-daemons.target ${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/ ln -s ../rc-local-shutdown.service ${DESTDIR}/usr/lib/systemd/system/shutdown.target.wants/ ln -s ../arch-modules-load.service ${DESTDIR}/usr/lib/systemd/system/sysinit.target.wants/ @@ -52,10 +54,10 @@ install: installdirs doc %.8: %.8.txt a2x -d manpage -f manpage $< -doc: rc.conf.5 parabola.7 rc.d.8 +doc: rc.conf.5 parabola.7 rc.d.8 arch-modules-load.8 arch-daemons.8 clean: - rm -f rc.conf.5 parabola.7 rc.d.8 + rm -f rc.conf.5 parabola.7 rc.d.8 arch-modules-load.8 arch-daemons.8 tar: git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz |