Merge branch 'master' into dev

This commit is contained in:
Adam Ierymenko 2017-07-07 09:36:54 -07:00
commit e14d5d49a1
2 changed files with 8 additions and 2 deletions

View file

@ -155,7 +155,7 @@ clean:
rm -rf *.a *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli $(ONE_OBJS) $(CORE_OBJS)
debug: FORCE
make -j 4 ZT_DEBUG=1
gmake -j 4 ZT_DEBUG=1
install: one
rm -f /usr/local/sbin/zerotier-one