diff options
| author | n-peugnet <n.peugnet@free.fr> | 2020-12-19 20:35:16 +0100 |
|---|---|---|
| committer | n-peugnet <n.peugnet@free.fr> | 2020-12-19 20:47:36 +0100 |
| commit | f6cc150d7052751d5c226ff8050db90d57355ed7 (patch) | |
| tree | 9baaa6e940c85e018273a48b410e24c94e32d8fb | |
| parent | a79599e974b12e67683def924e168525ead4221f (diff) | |
| download | wcms-f6cc150d7052751d5c226ff8050db90d57355ed7.tar.gz wcms-f6cc150d7052751d5c226ff8050db90d57355ed7.zip | |
fix make dist
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -6,10 +6,15 @@ build_dir := build js_src_dir := src # Misc variables. -PATH := vendor/bin:node_modules/.bin:$(PATH) +export PATH := vendor/bin:node_modules/.bin:$(PATH) ifneq ($(OS),Windows_NT) # Not for Windows - SHELL := PATH=$(PATH) /bin/bash +UNAME_S := $(shell uname -s) +ifeq ($(UNAME_S),Darwin) # For Mac +SHELL := PATH=$(PATH) /bin/bash +else +SHELL := /bin/bash +endif endif override GIT_VERSION := $(shell git --no-pager describe --always --tags) override CUR_VERSION := $(strip $(shell cat VERSION 2>/dev/null)) |