Skip to content
Snippets Groups Projects
Commit 016178d8 authored by vas's avatar vas
Browse files

more sensible handling of tweego

parent 09c65944
No related branches found
No related tags found
1 merge request!4610port build system to make
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4 deletions
makefile
+ 2
− 4
View file @ 016178d8
...@@ -3,8 +3,8 @@ HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD) ...@@ -3,8 +3,8 @@ HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
COMMIT := $(git rev-parse --short HEAD) COMMIT := $(git rev-parse --short HEAD)
uname := $(shell uname -s) uname := $(shell uname -s)
arch := $(shell uname -m) arch := $(shell uname -m)
TWEEGO := $(shell command -v tweego ; echo "$?") TWEEGO := $(shell command -v tweego || echo "$$?")
ifneq ($(TWEEGO),0) ifeq ($(TWEEGO),1)
ifeq ($(uname),Linux) ifeq ($(uname),Linux)
ifeq ($(arch),x86_64) ifeq ($(arch),x86_64)
TWEEGO := ./devTools/tweeGo/tweego_nix64 TWEEGO := ./devTools/tweeGo/tweego_nix64
...@@ -18,8 +18,6 @@ ifneq ($(TWEEGO),0) ...@@ -18,8 +18,6 @@ ifneq ($(TWEEGO),0)
TWEEGO := ./devTools/tweeGo/tweego_osx86 TWEEGO := ./devTools/tweeGo/tweego_osx86
endif endif
endif endif
else
TWEEGO := "tweego"
endif endif
all: bin/FC_pregmod.html bin/resources all: bin/FC_pregmod.html bin/resources
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment