From 7383957a8dc8a7c45fe161cc16a8bc8b022c1446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Thu, 21 Apr 2016 10:57:19 +0200 Subject: [PATCH] make: remove obsolete check for jenkins --- Makefile.include | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile.include b/Makefile.include index ba478149f..820b96be4 100644 --- a/Makefile.include +++ b/Makefile.include @@ -58,19 +58,17 @@ COLOR_ECHO := /bin/echo OS := $(shell uname) -ifeq (, ${JENKINS_URL}) - ifeq (0, $(shell tput colors 2>&1 > /dev/null; echo $$?)) - COLOR_GREEN := \033[1;32m - COLOR_RED := \033[1;31m - COLOR_YELLOW := \033[1;33m - COLOR_PURPLE := \033[1;35m - COLOR_RESET := \033[0m - ifeq ($(OS),Darwin) - COLOR_ECHO := echo -e - SHELL=bash - else - COLOR_ECHO := /bin/echo -e - endif +ifeq (0, $(shell tput colors 2>&1 > /dev/null; echo $$?)) + COLOR_GREEN := \033[1;32m + COLOR_RED := \033[1;31m + COLOR_YELLOW := \033[1;33m + COLOR_PURPLE := \033[1;35m + COLOR_RESET := \033[0m + ifeq ($(OS),Darwin) + COLOR_ECHO := echo -e + SHELL=bash + else + COLOR_ECHO := /bin/echo -e endif endif