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

Conflicts:
	Makefile

1 files changed, 23 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index ba1a798..e57dfd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 VER  := $(shell git describe)
+
 DIRS := \
 	/etc/rc.d \
 	/etc/conf.d \
@@ -8,14 +9,23 @@ DIRS := \
 	/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 \
-	/etc/bash_completion.d \
+	/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:
@@ -29,35 +39,28 @@ 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/man8 rc.d.8
-	install -m644 -t ${DESTDIR}/usr/share/man/man5 rc.conf.5 locale.conf.5 vconsole.conf.5 hostname.5
-	install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles arch-sysctl
+	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 bash-completion $(DESTDIR)/etc/bash_completion.d/rc.d
+	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
 
-rc.d.8: rc.d.8.txt
-	a2x -d manpage -f manpage rc.d.8.txt
-
-rc.conf.5: rc.conf.5.txt
-	a2x -d manpage -f manpage rc.conf.5.txt
+%.5: %.5.txt
+	a2x -d manpage -f manpage $<
 
-locale.conf.5: locale.conf.5.txt
-	a2x -d manpage -f manpage locale.conf.5.txt
+%.8: %.8.txt
+	a2x -d manpage -f manpage $<
 
-vconsole.conf.5: vconsole.conf.5.txt
-	a2x -d manpage -f manpage vconsole.conf.5.txt
-
-hostname.5: hostname.5.txt
-	a2x -d manpage -f manpage hostname.5.txt
-
-doc: rc.d.8 rc.conf.5 locale.conf.5 vconsole.conf.5 hostname.5
+doc: $(MAN_PAGES)
 
 clean:
-	rm -f rc.d.8 rc.conf.5 locale.conf.5 vconsole.conf.5 hostname.5
+	rm -f $(MAN_PAGES)
 
 tar:
 	git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz
 
 release: tar
 	scp initscripts-$(VER).tar.xz parabola:public/other/
+
+.PHONY: all installdirs install doc clean tar release