aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLex Neva <github.com@lexneva.name>2018-08-05 20:33:58 -0400
committerLex Neva <github.com@lexneva.name>2018-08-05 20:33:58 -0400
commiteebc8fdc1252a3206982c818685e50a4a75a4398 (patch)
tree499acace3107ba39a093c18f0debc6283c68ac63 /Makefile
parent0c74bcb81664134fd316455aa0886662c9b1f897 (diff)
parent50f7589d682e060c8d12a6fd30822fbeb7f2212a (diff)
Merge remote-tracking branch 'origin/master' into lexelby-convert-to-satin
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 326af11e..52ac919f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ EXTENSIONS:=inkstitch
# This gets the branch name or the name of the tag
VERSION:=$(TRAVIS_BRANCH)
-OS:=$(shell uname)
+OS:=$(TRAVIS_OS_NAME)
ARCH:=$(shell uname -m)
dist: distclean locales
@@ -17,7 +17,7 @@ dist: distclean locales
if [ "$$BUILD" = "windows" ]; then \
cd dist; zip -r ../inkstitch-$(VERSION)-win32.zip *; \
else \
- cd dist; tar zcf ../inkstitch-$(VERSION)-$(OS)-$(ARCH).tar.gz *; \
+ cd dist; tar zcf ../inkstitch-$(VERSION)-$(OS)-$(ARCH).tar.gz *; \
fi
distclean: