Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/net-tools/patches/net-tools-1.60-usr-move.patch

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1819 - (show annotations) (download)
    Tue Jun 26 19:54:22 2012 UTC (11 years, 10 months ago) by niro
    File size: 4156 byte(s) 
    -fixed patch, use prefix
    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:55:47.680982661 +0200
    4 @@ -72,6 +72,9 @@
    5 # set the base of the Installation
    6 # BASEDIR = /mnt
    7
    8 +# prefix for the Installation
    9 +PREFIX = /usr
    10 +
    11 # path to the net-lib support library. Default: lib
    12 NET_LIB_PATH = lib
    13 NET_LIB_NAME = net-tools
    14 @@ -221,39 +224,39 @@
    15 $(CC) $(LDFLAGS) -o mii-tool mii-tool.o
    16
    17 installbin:
    18 - install -m 0755 -d ${BASEDIR}/sbin
    19 - install -m 0755 -d ${BASEDIR}/bin
    20 - install -m 0755 arp ${BASEDIR}/sbin
    21 - install -m 0755 hostname ${BASEDIR}/bin
    22 - install -m 0755 ifconfig ${BASEDIR}/sbin
    23 - install -m 0755 nameif ${BASEDIR}/sbin
    24 - install -m 0755 netstat ${BASEDIR}/bin
    25 - install -m 0755 plipconfig $(BASEDIR)/sbin
    26 - install -m 0755 rarp ${BASEDIR}/sbin
    27 - install -m 0755 route ${BASEDIR}/sbin
    28 - install -m 0755 slattach $(BASEDIR)/sbin
    29 + install -m 0755 -d ${BASEDIR}/$(PREFIX)/sbin
    30 + install -m 0755 -d ${BASEDIR}/$(PREFIX)/bin
    31 + install -m 0755 arp ${BASEDIR}/$(PREFIX)/sbin
    32 + install -m 0755 hostname ${BASEDIR}/$(PREFIX)/bin
    33 + install -m 0755 ifconfig ${BASEDIR}/$(PREFIX)/sbin
    34 + install -m 0755 nameif ${BASEDIR}/$(PREFIX)/sbin
    35 + install -m 0755 netstat ${BASEDIR}/$(PREFIX)/bin
    36 + install -m 0755 plipconfig $(BASEDIR)/$(PREFIX)/sbin
    37 + install -m 0755 rarp ${BASEDIR}/$(PREFIX)/sbin
    38 + install -m 0755 route ${BASEDIR}/$(PREFIX)/sbin
    39 + install -m 0755 slattach $(BASEDIR)/$(PREFIX)/sbin
    40 ifeq ($(HAVE_IP_TOOLS),1)
    41 - install -m 0755 ipmaddr $(BASEDIR)/sbin
    42 - install -m 0755 iptunnel $(BASEDIR)/sbin
    43 + install -m 0755 ipmaddr $(BASEDIR)/$(PREFIX)/sbin
    44 + install -m 0755 iptunnel $(BASEDIR)/$(PREFIX)/sbin
    45 endif
    46 ifeq ($(HAVE_MII),1)
    47 - install -m 0755 mii-tool $(BASEDIR)/sbin
    48 + install -m 0755 mii-tool $(BASEDIR)/$(PREFIX)/sbin
    49 endif
    50 - ln -fs hostname $(BASEDIR)/bin/dnsdomainname
    51 - ln -fs hostname $(BASEDIR)/bin/ypdomainname
    52 - ln -fs hostname $(BASEDIR)/bin/nisdomainname
    53 - ln -fs hostname $(BASEDIR)/bin/domainname
    54 + ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/dnsdomainname
    55 + ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/ypdomainname
    56 + ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/nisdomainname
    57 + ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/domainname
    58 ifeq ($(HAVE_AFDECnet),1)
    59 - ln -fs hostname $(BASEDIR)/bin/nodename
    60 + ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/nodename
    61 endif
    62
    63 savebin:
    64 - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
    65 - ${BASEDIR}/bin/netstat \
    66 - ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \
    67 - ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \
    68 - ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \
    69 - ${BASEDIR}/bin/domainname ; do \
    70 + @for i in ${BASEDIR}/$(PREFIX)/sbin/arp ${BASEDIR}/$(PREFIX)/sbin/ifconfig \
    71 + ${BASEDIR}/$(PREFIX)/bin/netstat \
    72 + ${BASEDIR}/$(PREFIX)/sbin/rarp ${BASEDIR}/$(PREFIX)/sbin/route \
    73 + ${BASEDIR}/$(PREFIX)/bin/hostname ${BASEDIR}/$(PREFIX)/bin/ypdomainname \
    74 + ${BASEDIR}/$(PREFIX)/bin/dnsdomainname ${BASEDIR}/$(PREFIX)/bin/nisdomainname \
    75 + ${BASEDIR}/$(PREFIX)/bin/domainname ; do \
    76 [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved.
    77
    78 installdata:
    79 diff -Naur net-tools-1.60/man/Makefile net-tools-1.60-magellan/man/Makefile
    80 --- net-tools-1.60/man/Makefile 2000-10-28 12:59:42.000000000 +0200
    81 +++ net-tools-1.60-magellan/man/Makefile 2012-06-26 22:57:02.504982661 +0200
    82 @@ -24,8 +24,10 @@
    83 # your option) any later version.
    84 #
    85
    86 +PREFIX = /usr
    87 +
    88 INSTALL=install
    89 -mandir=/usr/share/man
    90 +mandir=$(PREFIX)/share/man
    91
    92 -include ../config.make
    93 ifeq ($(I18N),1)
    94 diff -Naur net-tools-1.60/po/Makefile net-tools-1.60-magellan/po/Makefile
    95 --- net-tools-1.60/po/Makefile 1999-11-20 22:02:59.000000000 +0100
    96 +++ net-tools-1.60-magellan/po/Makefile 2012-06-26 22:56:46.992982661 +0200
    97 @@ -1,7 +1,8 @@
    98 +PREFIX = /usr
    99 INSTALL=install -c
    100 INSTALL_PROGRAM= ${INSTALL}
    101 INSTALL_DATA= ${INSTALL} -m 644
    102 -INSTALLNLSDIR=${BASEDIR}/usr/share/locale
    103 +INSTALLNLSDIR=${BASEDIR}/$(PREFIX)/share/locale
    104
    105 TUPDATE = tupdate
    106