Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge

make-linux.mk

@@ -102,7 +102,8 @@ netcon: $(OBJS)
 	# Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
 	cd netcon ; make -f make-liblwip.mk
 	# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
-	cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o ../libzerotierintercept.so Intercept.c -ldl
+	cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -DDEBUG_RPC -DCHECKS -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libzerotierintercept.so Intercept.c -ldl
+	cp netcon/libzerotierintercept.so libzerotierintercept.so
 	ln -sf zerotier-netcon-service zerotier-cli
 	ln -sf zerotier-netcon-service zerotier-idtool
 

netcon/install-intercept.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cp libzerotierintercept.so /lib/libzerotierintercept.so
+ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+/usr/bin/install -c zerotier-intercept /usr/bin
+
+# rm -r /lib/libzerotierintercept.so
+# rm -r /lib/libzerotierintercept
+# rm -r /usr/bin/zerotier-intercept