From 754530904901304f55716db3bf164795343e99c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sun, 21 Jun 2015 21:16:18 +0200 Subject: Fix autopatch issues introduced in recent merges The good news is that these changes work with FreeBSD, as opposed to before the merges. --- core/deps.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/deps.mk') diff --git a/core/deps.mk b/core/deps.mk index e1fd8c7..3389cc1 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 [ x0 != x`grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \ + if [ 0 != `grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \ $(call dep_autopatch2,$(1)); \ - elif [ x0 != x`grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \ + elif [ 0 != `grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \ $(call dep_autopatch2,$(1)); \ - elif [ x0 != x`find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk | xargs grep -ci rebar` ]; then \ + elif [ -n "`find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk | xargs -r grep -i rebar`" ]; then \ $(call dep_autopatch2,$(1)); \ else \ if [ -f $(DEPS_DIR)/$(1)/erlang.mk ]; then \ -- cgit v1.2.3