From b603bf95b18c60fba4d6aa3ad2cb597c197ca6b5 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 11 Aug 2012 04:29:29 +0200 Subject: move archlinux(7) and locale.sh to filesystem The new locale.sh makes DAEMON_LOCALE redundant, so we remove that functionality. A post-upgrade notice will be added. The new functionality will apply the settings to /etc/locale.conf system-wide, and allow each user to override it in $HOME/.config/locale.conf. Signed-off-by: Tom Gundersen --- Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ac307e2..2ef9703 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 archlinux.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 @@ -47,16 +43,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 archlinux.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 archlinux.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 -- cgit v1.2.3-54-g00ecf