aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLex Neva <github.com@lexneva.name>2018-08-16 16:36:39 -0400
committerLex Neva <github.com@lexneva.name>2018-08-16 16:36:39 -0400
commit284748a682d4aa95c91cc215d5945181c833de15 (patch)
tree6334f284489243be5634fc811401de10631a87dd /Makefile
parent64062f7cd7eee9ed5701209618b0564a211c494b (diff)
parent0f882f07eb0fc263fcb8e05c1a212199902863da (diff)
Merge branch 'master' into lexelby-no-embroider-command
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: