aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLex Neva <lexelby@users.noreply.github.com>2018-08-02 20:03:16 -0400
committerGitHub <noreply@github.com>2018-08-02 20:03:16 -0400
commit820a69339ddd4652755e92d5206261f7b5913236 (patch)
tree6ad7b45943e957bfa2d81d321f72f8b86724ff6a /Makefile
parenteb98e851cdfdcc52f2ed7bcb1785d8ceb0b6bae8 (diff)
parentb8dc82570641eb5117d46980186c207b30e44223 (diff)
Merge pull request #181 from inkstitch/lexelby-mac-build-mk2
mac version
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: