From 016178d8298df7374c8a921e206eb99d92abec97 Mon Sep 17 00:00:00 2001 From: Vasileios Pasialiokis <whiterocket@outlook.com> Date: Sat, 25 May 2019 20:11:43 +0300 Subject: [PATCH] more sensible handling of tweego --- makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 9f9dbd72adf..c0ae7ef55ed 100644 --- a/makefile +++ b/makefile @@ -3,8 +3,8 @@ HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD) COMMIT := $(git rev-parse --short HEAD) uname := $(shell uname -s) arch := $(shell uname -m) -TWEEGO := $(shell command -v tweego ; echo "$?") -ifneq ($(TWEEGO),0) +TWEEGO := $(shell command -v tweego || echo "$$?") +ifeq ($(TWEEGO),1) ifeq ($(uname),Linux) ifeq ($(arch),x86_64) TWEEGO := ./devTools/tweeGo/tweego_nix64 @@ -18,8 +18,6 @@ ifneq ($(TWEEGO),0) TWEEGO := ./devTools/tweeGo/tweego_osx86 endif endif -else - TWEEGO := "tweego" endif all: bin/FC_pregmod.html bin/resources -- GitLab