diff --git a/.gitignore b/.gitignore
index d9e96b75d..339cc67b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,4 @@ coverage.out
 /indexers
 /log
 /public/img/avatar
-/integrations/gitea-integration
\ No newline at end of file
+/integrations/gitea-integration
diff --git a/Makefile b/Makefile
index 84d201e23..6b0c0327a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,5 @@
 DIST := dist
 IMPORT := code.gitea.io/gitea
-
-ifeq ($(OS), Windows_NT)
-	EXECUTABLE := gitea.exe
-else
-	EXECUTABLE := gitea
-endif
-
 BINDATA := modules/{options,public,templates}/bindata.go
 STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
 JAVASCRIPTS :=
@@ -22,7 +15,13 @@ SOURCES ?= $(shell find . -name "*.go" -type f)
 
 TAGS ?=
 
-TMPDIR := $(shell mktemp -d)
+TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gitea-temp')
+
+ifeq ($(OS), Windows_NT)
+	EXECUTABLE := gitea.exe
+else
+	EXECUTABLE := gitea
+endif
 
 ifneq ($(DRONE_TAG),)
 	VERSION ?= $(subst v,,$(DRONE_TAG))