--- elwix/patches/freebsd.tools-dir.patch 2017/06/13 17:57:53 1.1.2.1 +++ elwix/patches/freebsd.tools-dir.patch 2017/06/15 13:44:53 1.1.2.2 @@ -1,38 +1,7 @@ -Index: tools/tools/ifinfo/Makefile -=================================================================== ---- tools/tools/ifinfo/Makefile (revision 291302) -+++ tools/tools/ifinfo/Makefile (working copy) -@@ -3,5 +3,6 @@ - PROG= ifinfo - SRCS= ifinfo.c rfc1650.c - MAN= -+BINDIR= /usr/local/bin - - .include -Index: tools/tools/mctest/Makefile -=================================================================== ---- tools/tools/mctest/Makefile (revision 291302) -+++ tools/tools/mctest/Makefile (working copy) -@@ -1,6 +1,7 @@ - # $FreeBSD$ - - PROG_CXX= mctest -+BINDIR= /usr/local/bin - DPADD= ${LIBPTHREAD} - LDADD= -lpthread - Index: tools/tools/netmap/Makefile =================================================================== --- tools/tools/netmap/Makefile (revision 291302) +++ tools/tools/netmap/Makefile (working copy) -@@ -4,6 +4,7 @@ - # For multiple programs using a single source file each, - # we can just define 'progs' and create custom targets. - PROGS = pkt-gen bridge vale-ctl -+BINDIR = /usr/local/sbin - - CLEANFILES = $(PROGS) *.o - MAN= @@ -30,3 +31,8 @@ vale-ctl: vale-ctl.o @@ -40,39 +9,7 @@ Index: tools/tools/netmap/Makefile + +install: ${PROGS} + for i in ${PROGS}; do \ -+ install $$i ${DESTDIR}${BINDIR}; \ ++ install $$i ${DESTDIR}; \ + done -Index: tools/tools/netrate/netblast/Makefile -=================================================================== ---- tools/tools/netrate/netblast/Makefile (revision 291302) -+++ tools/tools/netrate/netblast/Makefile (working copy) -@@ -4,5 +4,6 @@ - - PROG= netblast - MAN= -+BINDIR= /usr/local/bin - - .include -Index: tools/tools/netrate/netreceive/Makefile -=================================================================== ---- tools/tools/netrate/netreceive/Makefile (revision 291302) -+++ tools/tools/netrate/netreceive/Makefile (working copy) -@@ -5,6 +5,7 @@ - PROG= netreceive - MAN= - LDFLAGS += -lpthread -+BINDIR= /usr/local/bin - - WARNS?= 3 - -Index: tools/tools/netrate/netsend/Makefile -=================================================================== ---- tools/tools/netrate/netsend/Makefile (revision 291302) -+++ tools/tools/netrate/netsend/Makefile (working copy) -@@ -5,5 +5,6 @@ - CFLAGS+= -Wall - PROG= netsend - MAN= -+BINDIR?= /usr/local/bin .include