Magellan Linux

Contents of /trunk/net-tools/patches/net-tools-1.60-usr-move.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1818 - (show annotations) (download)
Tue Jun 26 19:47:26 2012 UTC (11 years, 11 months ago) by niro
File size: 2905 byte(s)
-added patch for usr-move
1 diff -Naur net-tools-1.60/Makefile net-tools-1.60-magellan/Makefile
2 --- net-tools-1.60/Makefile 2001-04-15 16:34:31.000000000 +0200
3 +++ net-tools-1.60-magellan/Makefile 2012-06-26 22:49:36.984982661 +0200
4 @@ -221,39 +221,39 @@
5 $(CC) $(LDFLAGS) -o mii-tool mii-tool.o
6
7 installbin:
8 - install -m 0755 -d ${BASEDIR}/sbin
9 - install -m 0755 -d ${BASEDIR}/bin
10 - install -m 0755 arp ${BASEDIR}/sbin
11 - install -m 0755 hostname ${BASEDIR}/bin
12 - install -m 0755 ifconfig ${BASEDIR}/sbin
13 - install -m 0755 nameif ${BASEDIR}/sbin
14 - install -m 0755 netstat ${BASEDIR}/bin
15 - install -m 0755 plipconfig $(BASEDIR)/sbin
16 - install -m 0755 rarp ${BASEDIR}/sbin
17 - install -m 0755 route ${BASEDIR}/sbin
18 - install -m 0755 slattach $(BASEDIR)/sbin
19 + install -m 0755 -d ${BASEDIR}/usr/sbin
20 + install -m 0755 -d ${BASEDIR}/usr/bin
21 + install -m 0755 arp ${BASEDIR}/usr/sbin
22 + install -m 0755 hostname ${BASEDIR}/usr/bin
23 + install -m 0755 ifconfig ${BASEDIR}/usr/sbin
24 + install -m 0755 nameif ${BASEDIR}/usr/sbin
25 + install -m 0755 netstat ${BASEDIR}/usr/bin
26 + install -m 0755 plipconfig $(BASEDIR)/usr/sbin
27 + install -m 0755 rarp ${BASEDIR}/usr/sbin
28 + install -m 0755 route ${BASEDIR}/usr/sbin
29 + install -m 0755 slattach $(BASEDIR)/usr/sbin
30 ifeq ($(HAVE_IP_TOOLS),1)
31 - install -m 0755 ipmaddr $(BASEDIR)/sbin
32 - install -m 0755 iptunnel $(BASEDIR)/sbin
33 + install -m 0755 ipmaddr $(BASEDIR)/usr/sbin
34 + install -m 0755 iptunnel $(BASEDIR)/usr/sbin
35 endif
36 ifeq ($(HAVE_MII),1)
37 - install -m 0755 mii-tool $(BASEDIR)/sbin
38 + install -m 0755 mii-tool $(BASEDIR)/usr/sbin
39 endif
40 - ln -fs hostname $(BASEDIR)/bin/dnsdomainname
41 - ln -fs hostname $(BASEDIR)/bin/ypdomainname
42 - ln -fs hostname $(BASEDIR)/bin/nisdomainname
43 - ln -fs hostname $(BASEDIR)/bin/domainname
44 + ln -fs hostname $(BASEDIR)/usr/bin/dnsdomainname
45 + ln -fs hostname $(BASEDIR)/usr/bin/ypdomainname
46 + ln -fs hostname $(BASEDIR)/usr/bin/nisdomainname
47 + ln -fs hostname $(BASEDIR)/usr/bin/domainname
48 ifeq ($(HAVE_AFDECnet),1)
49 - ln -fs hostname $(BASEDIR)/bin/nodename
50 + ln -fs hostname $(BASEDIR)/usr/bin/nodename
51 endif
52
53 savebin:
54 - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
55 - ${BASEDIR}/bin/netstat \
56 - ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \
57 - ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \
58 - ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \
59 - ${BASEDIR}/bin/domainname ; do \
60 + @for i in ${BASEDIR}/usr/sbin/arp ${BASEDIR}/usr/sbin/ifconfig \
61 + ${BASEDIR}/usr/bin/netstat \
62 + ${BASEDIR}/usr/sbin/rarp ${BASEDIR}/usr/sbin/route \
63 + ${BASEDIR}/usr/bin/hostname ${BASEDIR}/usr/bin/ypdomainname \
64 + ${BASEDIR}/usr/bin/dnsdomainname ${BASEDIR}/usr/bin/nisdomainname \
65 + ${BASEDIR}/usr/bin/domainname ; do \
66 [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved.
67
68 installdata: