From 169f2b097bb7ffcab1b536d66437165e9c4ea2d8 Mon Sep 17 00:00:00 2001
From: n-peugnet <n.peugnet@free.fr>
Date: Sun, 17 Nov 2019 16:29:21 +0100
Subject: chore: minor file changes

- rename LICENSE.md into LICENSE
- move some vars in Makefile
- move prettier config outside of webpack config
---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 720127e..53ea1b1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,22 +2,22 @@ include .default.env
 include .env
 export
 
-build_dir := build
+build_dir  := build
+js_src_dir := src
 
 # Misc variables.
-PATH := vendor/bin:node_modules/.bin:$(PATH)
-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)
+PATH                    := vendor/bin:node_modules/.bin:$(PATH)
+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)
 override COMPOSER_FLAGS += $(if $(filter $(ENV),dist),--no-dev --prefer-dist)
-PREV_ENV_FILE := $(build_dir)/prev_env
-PREV_ENV := $(strip $(shell cat $(PREV_ENV_FILE) 2>/dev/null))
+PREV_ENV_FILE           := $(build_dir)/prev_env
+PREV_ENV                := $(strip $(shell cat $(PREV_ENV_FILE) 2>/dev/null))
 
 # Files variables.
-js_src_dir := src
-js_sources := $(wildcard $(js_src_dir)/*.js)
-js_bundles := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js)
-js_srcmaps := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js.map)
+js_sources  := $(wildcard $(js_src_dir)/*.js)
+js_bundles  := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js)
+js_srcmaps  := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js.map)
 zip_release := dist/w_cms_$(GIT_VERSION).zip
 
 # Default target. This executes everything targets needed to get a fully
-- 
cgit v1.2.3