aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorvincent-peugnet <v.peugnet@free.fr>2020-05-18 17:09:46 +0200
committervincent-peugnet <v.peugnet@free.fr>2020-05-18 17:09:46 +0200
commitbab3d969f6ab1846d818e4ef4d4f777c13575d88 (patch)
treeb8a09d75779f046a774e0b7afd36cfd5f9ca115a /Makefile
parent121af5f84ad9262e5c509dc1dd741166ca1dc3de (diff)
parentaa6bfe02129d37b75d9684e1d7f89d39412f8d12 (diff)
downloadwcms-bab3d969f6ab1846d818e4ef4d4f777c13575d88.tar.gz
wcms-bab3d969f6ab1846d818e4ef4d4f777c13575d88.zip
Merge branch 'master' of https://github.com/vincent-peugnet/wcms
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1204a5a..e3fc1ad 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,10 @@ js_src_dir := src
# Misc variables.
PATH := vendor/bin:node_modules/.bin:$(PATH)
+
+ifneq ($(OS),Windows_NT) # Not for Windows
+ SHELL := PATH=$(PATH) /bin/bash
+endif
override GIT_VERSION := $(shell git --no-pager describe --always --tags)
override CUR_VERSION := $(strip $(shell cat VERSION 2>/dev/null))
override WEBPACK_FLAGS += $(if $(filter $(ENV),dist),-p)