1From 5e35aa105e7a2e85db2a89fee4114090b1ac55be Mon Sep 17 00:00:00 2001 2From: Qing He <qing.he@intel.com> 3Date: Fri, 18 Jun 2010 09:40:30 +0800 4Subject: [PATCH] sysvinit: upgrade to version 2.88dsf 5 6Upstream-Status: Pending 7 8--- 9 src/Makefile | 53 +++++++++++++++++++++++++++++----------------------- 10 1 file changed, 30 insertions(+), 23 deletions(-) 11 12diff --git a/src/Makefile b/src/Makefile 13index 1b368dc..5b1a5a2 100644 14--- a/src/Makefile 15+++ b/src/Makefile 16@@ -77,7 +77,14 @@ else 17 INSTALL_DATA = install -m 644 18 endif 19 INSTALL_DIR = install -m 755 -d 20-MANDIR = /usr/share/man 21+ 22+ROOT ?= 23+base_bindir ?= /bin 24+base_sbindir ?= /sbin 25+bindir ?= /usr/bin 26+sysconfdir ?= /etc 27+includedir ?= /usr/include 28+mandir ?= /usr/share/man 29 30 ifeq ($(WITH_SELINUX),yes) 31 SELINUX_DEF = -DWITH_SELINUX 32@@ -191,43 +198,43 @@ clobber: cleanobjs 33 distclean: clobber 34 35 install: all 36- $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/ 37- $(INSTALL_DIR) $(ROOT)/usr/bin/ 38+ $(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/ 39+ $(INSTALL_DIR) $(ROOT)$(bindir)/ 40 for i in $(BIN); do \ 41- $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \ 42+ $(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \ 43 done 44 for i in $(SBIN); do \ 45- $(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \ 46+ $(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \ 47 done 48 for i in $(USRBIN); do \ 49- $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \ 50+ $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \ 51 done 52 # $(INSTALL_DIR) $(ROOT)/etc/ 53 $(INSTALL_DIR) $(ROOT)/etc/inittab.d 54 # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/ 55- ln -sf halt $(ROOT)/sbin/reboot 56- ln -sf halt $(ROOT)/sbin/poweroff 57- ln -sf init $(ROOT)/sbin/telinit 58- ln -sf /sbin/killall5 $(ROOT)/bin/pidof 59- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ 60- ln -sf last $(ROOT)/usr/bin/lastb; \ 61+ ln -sf halt $(ROOT)$(base_sbindir)/reboot 62+ ln -sf halt $(ROOT)$(base_sbindir)/poweroff 63+ ln -sf init $(ROOT)$(base_sbindir)/telinit 64+ ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof 65+ if [ ! -f $(ROOT)$(bindir)/lastb ]; then \ 66+ ln -sf last $(ROOT)$(bindir)/lastb; \ 67 fi 68- $(INSTALL_DIR) $(ROOT)/usr/include/ 69- $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ 70- $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/ 71- $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/ 72- $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/ 73+ $(INSTALL_DIR) $(ROOT)$(includedir)/ 74+ $(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/ 75+ $(INSTALL_DIR) $(ROOT)$(mandir)/man1/ 76+ $(INSTALL_DIR) $(ROOT)$(mandir)/man5/ 77+ $(INSTALL_DIR) $(ROOT)$(mandir)/man8/ 78 for man in $(MAN1); do \ 79- $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/; \ 80- sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \ 81+ $(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man1/; \ 82+ sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man1/$$man ; \ 83 done 84 for man in $(MAN5); do \ 85- $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/; \ 86- sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \ 87+ $(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man5/; \ 88+ sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man5/$$man ; \ 89 done 90 for man in $(MAN8); do \ 91- $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/; \ 92- sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \ 93+ $(INSTALL_DATA) ../man/$$man $(ROOT)$(mandir)/man8/; \ 94+ sed -i "1{ $(MANDB); }" $(ROOT)$(mandir)/man8/$$man ; \ 95 done 96 ifeq ($(ROOT),) 97 # 98