diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-07-29 19:29:13 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-07-29 19:29:13 -0300 |
commit | fb73f5847b81d93beaf85f7c35999ce01527b097 (patch) | |
tree | 2bf8c60ceb8953c2770331370c2fdedf580c5a27 /Makefile | |
parent | 97232dd346b6e959675def22596d034100d6e91b (diff) | |
parent | ad6100d47b2d5337d1645e946de6f450dc990ff8 (diff) |
Merge branch 'master' of git://projects.archlinux.org/initscripts
Conflicts:
Makefile
rc.conf
rc.sysinit
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -2,15 +2,19 @@ VER := $(shell git describe) DIRS := \ /etc/rc.d \ - /etc/conf.d \ /etc/rc.d/functions.d \ /etc/logrotate.d \ /etc/profile.d \ /usr/lib/tmpfiles.d \ + /usr/lib/systemd/system-generators \ + /usr/lib/systemd/system/multi-user.target.wants \ + /usr/lib/systemd/system/shutdown.target.wants \ + /usr/lib/systemd/system/sysinit.target.wants \ /usr/sbin \ /usr/share/bash-completion/completions \ /usr/share/zsh/site-functions \ /usr/share/man/man5 \ + /usr/share/man/man7 \ /usr/share/man/man8 all: doc @@ -27,21 +31,31 @@ install: installdirs doc install -m755 -t $(DESTDIR)/etc/profile.d locale.sh 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 archlinux.7 install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.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 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 ../rc-local.service ${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/ %.5: %.5.txt a2x -d manpage -f manpage $< +%.7: %.7.txt + a2x -d manpage -f manpage $< + %.8: %.8.txt a2x -d manpage -f manpage $< -doc: rc.conf.5 rc.d.8 +doc: rc.conf.5 archlinux.7 rc.d.8 clean: - rm -f rc.conf.5 rc.d.8 + rm -f rc.conf.5 archlinux.7 rc.d.8 tar: git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz |