Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.1

Conflicts:
	hostname.5.txt
	locale.conf.5.txt

1 files changed, 4 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index e57dfd2..eeaa077 100644
--- a/Makefile
+++ b/Makefile
@@ -6,26 +6,13 @@ DIRS := \
 	/etc/rc.d/functions.d \
 	/etc/logrotate.d \
 	/etc/profile.d \
-	/usr/sbin \
-	/etc/tmpfiles.d \
 	/usr/lib/tmpfiles.d \
-	/etc/binfmt.d \
-	/usr/lib/binfmt.d \
-	/etc/sysctl.d \
-	/usr/lib/sysctl.d \
-	/usr/lib/initscripts \
+	/usr/sbin \
 	/usr/share/bash-completion/completions \
 	/usr/share/zsh/site-functions \
 	/usr/share/man/man5 \
 	/usr/share/man/man8
 
-MAN_PAGES := \
-	rc.d.8 \
-	rc.conf.5 \
-	locale.conf.5 \
-	vconsole.conf.5 \
-	hostname.5
-
 all: doc
 
 installdirs:
@@ -39,10 +26,9 @@ install: installdirs doc
 	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 $(filter %.5, $(MAN_PAGES))
-	install -m644 -t $(DESTDIR)/usr/share/man/man8 $(filter %.8, $(MAN_PAGES))
-	install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles arch-sysctl arch-binfmt
-	install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/arch.conf
+	install -m644 -t $(DESTDIR)/usr/share/man/man5 rc.conf.5
+	install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.8
+	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