blob: 0dc1e209ccbe712d5fdd069296db653845a3a8e3 (
plain)
1 diff -ru sysvinit-2.86/src/Makefile sysvinit-2.86-new/src/Makefile
2 --- sysvinit-2.86/src/Makefile 2004-06-09 14:47:45.000000000 +0200
3 +++ sysvinit-2.86-new/src/Makefile 2004-12-11 23:19:19.704905960 +0100
4 @@ -9,7 +9,7 @@
5 #
6
7 CC = gcc
8 -CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
9 +CFLAGS += -Wall -fomit-frame-pointer -D_GNU_SOURCE
10 LDFLAGS = -s
11 STATIC =
12
13 @@ -24,11 +24,10 @@
14 MAN8 += shutdown.8 telinit.8
15
16 ifeq ($(DISTRO),)
17 -BIN += mountpoint
18 -SBIN += sulogin bootlogd
19 -USRBIN += utmpdump wall
20 -MAN1 += mountpoint.1 wall.1
21 -MAN8 += sulogin.8 bootlogd.8
22 +SBIN += sulogin
23 +USRBIN += wall
24 +MAN1 += wall.1
25 +MAN8 += sulogin.8
26 endif
27
28 ifeq ($(DISTRO),Debian)
29 @@ -47,7 +46,7 @@
30 BIN_GROUP = root
31 BIN_COMBO = $(BIN_OWNER):$(BIN_GROUP)
32 INSTALL = install -o $(BIN_OWNER) -g $(BIN_GROUP)
33 -MANDIR = /usr/share/man
34 +MANDIR = /usr/man
35
36 # Additional libs for GNU libc.
37 ifneq ($(wildcard /usr/lib/libcrypt.a),)
38 @@ -111,31 +110,32 @@
39
40 install:
41 for i in $(BIN); do \
42 - $(INSTALL) -m 755 $$i $(ROOT)/bin/; \
43 + $(INSTALL) -D -m 755 $$i $(ROOT)/bin/$$i; \
44 done
45 for i in $(SBIN); do \
46 - $(INSTALL) -m 755 $$i $(ROOT)/sbin/; \
47 + $(INSTALL) -D -m 755 $$i $(ROOT)/sbin/$$i; \
48 done
49 for i in $(USRBIN); do \
50 - $(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
51 + $(INSTALL) -D -m 755 $$i $(ROOT)/usr/bin/$$i; \
52 done
53 # $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/
54 ln -sf halt $(ROOT)/sbin/reboot
55 ln -sf halt $(ROOT)/sbin/poweroff
56 ln -sf init $(ROOT)/sbin/telinit
57 + install -d $(ROOT)/bin
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 fi
62 - $(INSTALL) -m 644 initreq.h $(ROOT)/usr/include/
63 + $(INSTALL) -D -m 644 initreq.h $(ROOT)/usr/include/initreq.h
64 for i in $(MAN1); do \
65 - $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
66 + $(INSTALL) -D -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/$$i; \
67 done
68 for i in $(MAN5); do \
69 - $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man5/; \
70 + $(INSTALL) -D -m 644 ../man/$$i $(ROOT)$(MANDIR)/man5/$$i; \
71 done
72 for i in $(MAN8); do \
73 - $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \
74 + $(INSTALL) -D -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/$$i; \
75 done
76 ifeq ($(ROOT),)
77 #
|
