aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLex Neva <github.com@lexneva.name>2018-08-05 20:25:04 -0400
committerLex Neva <github.com@lexneva.name>2018-08-05 20:25:04 -0400
commitc72a1d761f8bb427b78896b2546257cfc7aa1f69 (patch)
tree1acb2fd292be575247f778ae5d34d96ccee2c285 /Makefile
parentf8f108367abf71e2e8a2eb7718a2759568337c53 (diff)
parent1ab23cd8742b023ddaa832cb84d73f48b5950a14 (diff)
Merge remote-tracking branch 'origin/master' into lexelby-bean-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: