From 4f8fb82bafb87238d989150db778afb8ae32ffd4 Mon Sep 17 00:00:00 2001
From: Mikael Roos <mikael.t.h.roos@gmail.com>
Date: Fri, 3 Mar 2017 21:40:46 +0100
Subject: [PATCH] change how path is working in makefile

---
 Makefile | 55 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 15f6bf3..959fcbd 100644
--- a/Makefile
+++ b/Makefile
@@ -29,16 +29,21 @@ THIS_MAKEFILE := $(call WHERE-AM-I)
 HELPTEXT = $(ECHO) "$(ACTION)--->" `egrep "^\# target: $(1) " $(THIS_MAKEFILE) | sed "s/\# target: $(1)[ ]*-[ ]* / /g"` "$(NO_COLOR)"
 
 # Add local bin path for test tools
-#PATH_ORIG = $(PATH)
-PATH := "./.bin:./vendor/bin:./node_modules/.bin:$(PATH)"
-SHELL := env PATH=$(PATH) $(SHELL)
+#PATH := "./.bin:./vendor/bin:./node_modules/.bin:$(PATH)"
+#SHELL := env PATH=$(PATH) $(SHELL)
+PHPUNIT := .bin/phpunit
+PHPLOC 	:= .bin/phploc
+PHPCS   := .bin/phpcs
+PHPCBF  := .bin/phpcbf
+PHPMD   := .bin/phpmd
+PHPDOC  := .bin/phpdoc
+BEHAT   := .bin/behat
 
 
 
 # target: help               - Displays help.
 .PHONY:  help
 help:
-	echo $(SHELL)
 	@$(call HELPTEXT,$@)
 	@$(ECHO) "Usage:"
 	@$(ECHO) " make [target] ..."
@@ -133,19 +138,19 @@ tag-prepare:
 .PHONY: install-tools-php
 install-tools-php:
 	@$(call HELPTEXT,$@)
-	curl -Lso bin/phpdoc https://www.phpdoc.org/phpDocumentor.phar && chmod 755 bin/phpdoc
+	curl -Lso $(PHPDOC) https://www.phpdoc.org/phpDocumentor.phar && chmod 755 $(PHPDOC)
 
-	curl -Lso bin/phpcs https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar && chmod 755 bin/phpcs
+	curl -Lso $(PHPCS) https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar && chmod 755 $(PHPCS)
 
-	curl -Lso bin/phpcbf https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar && chmod 755 bin/phpcbf
+	curl -Lso $(PHPCBF) https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar && chmod 755 $(PHPCBF)
 
-	curl -Lso bin/phpmd http://static.phpmd.org/php/latest/phpmd.phar && chmod 755 bin/phpmd
+	curl -Lso $(PHPMD) http://static.phpmd.org/php/latest/phpmd.phar && chmod 755 $(PHPMD)
 
-	curl -Lso bin/phpunit https://phar.phpunit.de/phpunit-5.7.9.phar && chmod 755 bin/phpunit
+	curl -Lso $(PHPUNIT) https://phar.phpunit.de/phpunit-5.7.9.phar && chmod 755 $(PHPUNIT)
 
-	curl -Lso bin/phploc https://phar.phpunit.de/phploc.phar && chmod 755 bin/phploc
+	curl -Lso $(PHPLOC) https://phar.phpunit.de/phploc.phar && chmod 755 $(PHPLOC)
 
-	curl -Lso bin/behat https://github.com/Behat/Behat/releases/download/v3.3.0/behat.phar && chmod 755 bin/behat
+	curl -Lso $(BEHAT) https://github.com/Behat/Behat/releases/download/v3.3.0/behat.phar && chmod 755 $(BEHAT)
 
 	composer install
 
@@ -156,13 +161,13 @@ install-tools-php:
 .PHONY: check-tools-php
 check-tools-php:
 	@$(call HELPTEXT,$@)
-	which phpunit && phpunit --version
-	which phploc && phploc --version
-	which phpcs && phpcs --version && echo
-	which phpmd && phpmd --version && echo
-	which phpcbf && phpcbf --version && echo
-	which phpdoc && phpdoc --version && echo
-	which behat && behat --version && echo
+	which $(PHPUNIT) && $(PHPUNIT) --version
+	which $(PHPLOC) && $(PHPLOC) --version
+	which $(PHPCS) && $(PHPCS) --version && echo
+	which $(PHPMD) && $(PHPMD) --version && echo
+	which $(PHPCBF) && $(PHPCBF) --version && echo
+	which $(PHPDOC) && $(PHPDOC) --version && echo
+	which $(BEHAT) && $(BEHAT) --version && echo
 
 
 
@@ -170,7 +175,7 @@ check-tools-php:
 .PHONY: phpunit
 phpunit: prepare
 	@$(call HELPTEXT,$@)
-	phpunit --configuration .phpunit.xml
+	$(PHPUNIT) --configuration .phpunit.xml
 
 
 
@@ -178,7 +183,7 @@ phpunit: prepare
 .PHONY: phpcs
 phpcs: prepare
 	@$(call HELPTEXT,$@)
-	phpcs --standard=.phpcs.xml | tee build/phpcs
+	$(PHPCS) --standard=.phpcs.xml | tee build/phpcs
 
 
 
@@ -186,7 +191,7 @@ phpcs: prepare
 .PHONY: phpcbf
 phpcbf:
 	@$(call HELPTEXT,$@)
-	phpcbf --standard=.phpcs.xml
+	$(PHPCBF) --standard=.phpcs.xml
 
 
 
@@ -194,7 +199,7 @@ phpcbf:
 .PHONY: phpmd
 phpmd: prepare
 	@$(call HELPTEXT,$@)
-	- phpmd . text .phpmd.xml | tee build/phpmd
+	- $(PHPMD) . text .phpmd.xml | tee build/phpmd
 
 
 
@@ -202,7 +207,7 @@ phpmd: prepare
 .PHONY: phploc
 phploc: prepare
 	@$(call HELPTEXT,$@)
-	phploc src > build/phploc
+	$(PHPLOC) src > build/phploc
 
 
 
@@ -210,7 +215,7 @@ phploc: prepare
 .PHONY: phpdoc
 phpdoc:
 	@$(call HELPTEXT,$@)
-	phpdoc --config=.phpdoc.xml
+	$(PHPDOC) --config=.phpdoc.xml
 
 
 
@@ -218,4 +223,4 @@ phpdoc:
 .PHONY: behat
 behat:
 	@$(call HELPTEXT,$@)
-	behat
+	$(BEHAT)