Home Explore Help
Sign In
Emulatorman
/
core
mirror of https://git.hyperbola.info:50100/packages/core.git/
Watch 1
Star 0
Fork 0
Files Issues
Branch: master
Branches Tags
core
/
net-tools
/
make-net-tools-fhs-compliant.patch

make-net-tools-fhs-compliant.patch 1.8 KB
Permalink History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 
  1. diff --git a/Makefile b/Makefile
    2. 

  2. index bf67bc6..c845922 100644
    3. 

  3. --- a/Makefile
    4. 

  4. +++ b/Makefile
    5. 

  5. @@ -26,6 +26,7 @@
    6. 

  6.  # set the base of the Installation
    7. 

  7.  # BASEDIR = /mnt
    8. 

  8.  BASEDIR ?= $(DESTDIR)
    9. 

  9. +PREFIX ?= /usr
    10. 

  10.  BINDIR ?= /bin
    11. 

  11.  SBINDIR ?= /sbin
    12. 

  12.  
    13. 

  13. @@ -206,19 +207,15 @@ mii-tool:	$(NET_LIB) mii-tool.o
    14. 

  14.  		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(LDLIBS)
    15. 

  15.  
    16. 

  16.  installbin:
    17. 

  17. -	@echo
    18. 

  18. -	@echo "######################################################"
    19. 

  19. -	@echo "Notice: ifconfig and route are now installed into /bin"
    20. 

  20. -	@echo "######################################################"
    21. 

  21. -	@echo
    22. 

  22.  	install -m 0755 -d ${BASEDIR}${SBINDIR}
    23. 

  23.  	install -m 0755 -d ${BASEDIR}${BINDIR}
    24. 

  24. -	install -m 0755 ifconfig   ${BASEDIR}${BINDIR}
    25. 

  25. +	install -m 0755 -d ${BASEDIR}${PREFIX}${SBINDIR}
    26. 

  26. +	install -m 0755 ifconfig   ${BASEDIR}${SBINDIR}
    27. 

  27.  	install -m 0755 nameif     ${BASEDIR}${SBINDIR}
    28. 

  28.  	install -m 0755 netstat    ${BASEDIR}${BINDIR}
    29. 

  29. -	install -m 0755 route      ${BASEDIR}${BINDIR}
    30. 

  30. +	install -m 0755 route      ${BASEDIR}${SBINDIR}
    31. 

  31.  ifeq ($(HAVE_ARP_TOOLS),1)
    32. 

  32. -	install -m 0755 arp        ${BASEDIR}${SBINDIR}
    33. 

  33. +	install -m 0755 arp        ${BASEDIR}${PREFIX}${SBINDIR}
    34. 

  34.  	install -m 0755 rarp       ${BASEDIR}${SBINDIR}
    35. 

  35.  endif
    36. 

  36.  ifeq ($(HAVE_HOSTNAME_TOOLS),1)
    37. 

  37. @@ -248,9 +245,9 @@ ifeq ($(HAVE_SERIAL_TOOLS),1)
    38. 

  38.  endif
    39. 

  39.  
    40. 

  40.  savebin:
    41. 

  41. -	@for i in ${BASEDIR}${SBINDIR}/arp ${BASEDIR}${SBINDIR}/ifconfig \
    42. 

  42. +	@for i in ${BASEDIR}${PREFIX}${BINDIR}/arp ${BASEDIR}${SBINDIR}/ifconfig \
    43. 

  43.                   ${BASEDIR}${BINDIR}/netstat \
    44. 

  44. -		 ${BASEDIR}${SBINDIR}/rarp ${BASEDIR}${SBINDIR}/route \
    45. 

  45. +		 ${BASEDIR}${SBINDIR}/rarp ${BASEDIR}${BINDIR}/route \
    46. 

  46.  		 ${BASEDIR}${BINDIR}/hostname ${BASEDIR}${BINDIR}/ypdomainname \
    47. 

  47.                   ${BASEDIR}${BINDIR}/dnsdomainname ${BASEDIR}${BINDIR}/nisdomainname \
    48. 

  48.  		 ${BASEDIR}${BINDIR}/domainname ; do \
    49. 

  49.