diff --git a/Makefile b/Makefile
index 852c94cb980a7da43c28a2e1e41ba05fa06bd041..28ec6b6baba5eca0eca67bc5c5a564bb1677dcb4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@ MAKEFLAGS += -r
 export TWEEGO_PATH=devTools/tweeGo/storyFormats
 HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
-uname := $(shell uname -s)
-arch := $(shell uname -m)
-arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
-TWEEGO := $(shell if type tweego; then echo tweego; else echo 1; fi)
-ifeq ($(TWEEGO),1)
+TWEEGO := $(shell command -v tweego 2>/dev/null)
+ifndef TWEEGO
+	uname := $(shell uname -s)
+	arch := $(shell uname -m)
+	arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
 	ifeq ($(uname),Linux)
 		ifeq ($(arch),64)
 			TWEEGO := devTools/tweeGo/tweego_nix64