summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLex Neva <github.com@lexneva.name>2018-08-05 20:31:53 -0400
committerLex Neva <github.com@lexneva.name>2018-08-05 20:31:53 -0400
commitf749c4c1e8c5ccb64e8977f948bb037e2dbdc651 (patch)
tree0872a6c459145e76e3c53d36d0070b8e127be9f6 /Makefile
parent0ab7223980d849dd732cb9572644339d5c2a6228 (diff)
parent0f826fbd2409b16faa170dd7ac7dde8f910d8cc3 (diff)
Merge remote-tracking branch 'origin/master' into lexelby-e-stitch
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: