Skip to content
Snippets Groups Projects
Commit ea9a9adf authored by ezsh's avatar ezsh Committed by lowercasedonkey
Browse files

Fix Makefile work with zsh

In Zsh type prints not only executable path:
$ type tweego
tweego is /usr/bin/tweego

These additional words break the Makefile

Fixes #794 and closes #796.
parent e3a6f5a3
No related branches found
No related tags found
1 merge request!4641MultiBrand (ready for review)
......@@ -2,11 +2,11 @@ MAKEFLAGS += -r
export TWEEGO_PATH=devTools/tweeGo/storyFormats
HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
COMMIT := $(shell git rev-parse --short HEAD)
uname := $(shell uname -s)
arch := $(shell uname -m)
arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
TWEEGO := $(shell if type tweego; then echo tweego; else echo 1; fi)
ifeq ($(TWEEGO),1)
TWEEGO := $(shell command -v tweego 2>/dev/null)
ifndef TWEEGO
uname := $(shell uname -s)
arch := $(shell uname -m)
arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
ifeq ($(uname),Linux)
ifeq ($(arch),64)
TWEEGO := devTools/tweeGo/tweego_nix64
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment