summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-31 22:15:17 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-31 22:15:17 -0300
commita1642a5964035040dcbf07af01418375e45bb128 (patch)
treeeaccd090fe7f046a241d9897544b2354a36b8a80 /Makefile
parent2fb1be996d4d8d459f4b4953a84af63f981b0bf0 (diff)
parentc67d598d1cb2c346c83b72449bf20ee5dfea9ae7 (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.09.1
Conflicts: Makefile parabola.7.txt
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index d2668db..777c7ff 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ DIRS := \
/etc/rc.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 \
@@ -14,7 +13,6 @@ DIRS := \
/usr/share/bash-completion/completions \
/usr/share/zsh/site-functions \
/usr/share/man/man5 \
- /usr/share/man/man7 \
/usr/share/man/man8
all: doc
@@ -28,10 +26,8 @@ install: installdirs doc
install -m644 -t $(DESTDIR)/etc/logrotate.d bootlog
install -m644 -t $(DESTDIR)/etc/rc.d functions
install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs
- 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 parabola.7
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
@@ -48,16 +44,13 @@ install: installdirs doc
%.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 parabola.7 rc.d.8 arch-modules-load.8 arch-daemons.8
+doc: rc.conf.5 rc.d.8 arch-modules-load.8 arch-daemons.8
clean:
- rm -f rc.conf.5 parabola.7 rc.d.8 arch-modules-load.8 arch-daemons.8
+ rm -f rc.conf.5 rc.d.8 arch-modules-load.8 arch-daemons.8
tar:
git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz