blob: 90563a62946ae7effc08fb0ef7f6ca9c8f694dbd [file] [log] [blame]
Andrew Geissler635e0e42020-08-21 15:58:33 -05001From 5e35aa105e7a2e85db2a89fee4114090b1ac55be Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -05002From: Qing He <qing.he@intel.com>
3Date: Fri, 18 Jun 2010 09:40:30 +0800
4Subject: [PATCH] sysvinit: upgrade to version 2.88dsf
5
Patrick Williamsc124f4f2015-09-15 14:41:29 -05006Upstream-Status: Pending
7
Andrew Geissler82c905d2020-04-13 13:39:40 -05008---
9 src/Makefile | 53 +++++++++++++++++++++++++++++-----------------------
10 1 file changed, 30 insertions(+), 23 deletions(-)
11
Patrick Williamsc124f4f2015-09-15 14:41:29 -050012diff --git a/src/Makefile b/src/Makefile
Andrew Geissler635e0e42020-08-21 15:58:33 -050013index 1b368dc..5b1a5a2 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050014--- a/src/Makefile
15+++ b/src/Makefile
Andrew Geissler82c905d2020-04-13 13:39:40 -050016@@ -77,7 +77,14 @@ else
Patrick Williamsc124f4f2015-09-15 14:41:29 -050017 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
Andrew Geissler635e0e42020-08-21 15:58:33 -050032@@ -191,43 +198,43 @@ clobber: cleanobjs
Patrick Williamsc124f4f2015-09-15 14:41:29 -050033 distclean: clobber
34
Andrew Geissler82c905d2020-04-13 13:39:40 -050035 install: all
Patrick Williamsc124f4f2015-09-15 14:41:29 -050036- $(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
Andrew Geissler82c905d2020-04-13 13:39:40 -050052 # $(INSTALL_DIR) $(ROOT)/etc/
Andrew Geissler635e0e42020-08-21 15:58:33 -050053 $(INSTALL_DIR) $(ROOT)/etc/inittab.d
Andrew Geissler82c905d2020-04-13 13:39:40 -050054 # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
Patrick Williamsc124f4f2015-09-15 14:41:29 -050055- 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; \
Patrick Williamsc124f4f2015-09-15 14:41:29 -050061+ 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/
Andrew Geissler82c905d2020-04-13 13:39:40 -050078 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 ; \
Patrick Williamsc124f4f2015-09-15 14:41:29 -050083 done
Andrew Geissler82c905d2020-04-13 13:39:40 -050084 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 ; \
Patrick Williamsc124f4f2015-09-15 14:41:29 -050089 done
Andrew Geissler82c905d2020-04-13 13:39:40 -050090 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 ; \
Patrick Williamsc124f4f2015-09-15 14:41:29 -050095 done
96 ifeq ($(ROOT),)
97 #