aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/deps.mk6
-rw-r--r--plugins/elvis.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/core/deps.mk b/core/deps.mk
index dc21588..2fc1e70 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -68,11 +68,11 @@ distclean:: distclean-deps distclean-pkg
# in practice only Makefile is needed so far.
define dep_autopatch
if [ -f $(DEPS_DIR)/$(1)/Makefile ]; then \
- if [ 0 != `grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \
+ if [ x0 != x`grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \
$(call dep_autopatch2,$(1)); \
- elif [ 0 != `grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \
+ elif [ x0 != x`grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \
$(call dep_autopatch2,$(1)); \
- elif [ 0 != `find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk | xargs grep -ci rebar` ]; then \
+ elif [ x0 != x`find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk | xargs grep -ci rebar` ]; then \
$(call dep_autopatch2,$(1)); \
else \
if [ -f $(DEPS_DIR)/$(1)/erlang.mk ]; then \
diff --git a/plugins/elvis.mk b/plugins/elvis.mk
index 580e2f5..c0cca9e 100644
--- a/plugins/elvis.mk
+++ b/plugins/elvis.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, Juan Facorro <[email protected]>
+# Copyright (c) 2015, Erlang Solutions Ltd.
# This file is part of erlang.mk and subject to the terms of the ISC License.
.PHONY: elvis distclean-elvis
@@ -10,8 +10,8 @@ ELVIS_CONFIG ?= $(CURDIR)/elvis.config
ELVIS ?= $(CURDIR)/elvis
export ELVIS
-ELVIS_URL ?= https://github.com/inaka/elvis/releases/download/0.2.3/elvis
-ELVIS_CONFIG_URL ?= https://github.com/inaka/elvis/releases/download/0.2.3/elvis.config
+ELVIS_URL ?= https://github.com/inaka/elvis/releases/download/0.2.5-beta2/elvis
+ELVIS_CONFIG_URL ?= https://github.com/inaka/elvis/releases/download/0.2.5-beta2/elvis.config
ELVIS_OPTS ?=
# Core targets.