Merge pull request #776 from benjamb/master

Fix host architecture detection

Author: hilary

Makefile

@@ -25,15 +25,15 @@ OUT_D = $(shell echo $${OUT_D:-$(my_d)/builds})
 DOCS_OUT = $(shell echo $${DOCS_OUT:-$(my_d)/builds/docs/yaml})
 
 UNAME_S := $(shell uname -s)
-UNAME_P := $(shell uname -p)
+UNAME_M := $(shell uname -m)
 
 GOOS = linux
 ifeq ($(UNAME_S),Darwin)
   GOOS = darwin
 endif
 
 GOARCH = amd64
-ifneq ($(UNAME_P), x86_64)
+ifneq ($(UNAME_M), x86_64)
   GOARCH = 386
 endif