Merge branch 'master' into relax-caa

This commit is contained in:
Roland Bracewell Shoemaker 2016-02-10 15:35:12 -08:00
commit 423d0c7e79
1 changed files with 1 additions and 1 deletions

View File

@ -1,7 +1,7 @@
# This Makefile also tricks Travis into not running 'go get' for our
# build. See http://docs.travis-ci.com/user/languages/go/
OBJDIR ?= ./bin
OBJDIR ?= $(shell pwd)/bin
DESTDIR ?= /usr/local/bin
ARCHIVEDIR ?= /tmp