diff options
| author | Loïc Hoguin <[email protected]> | 2015-06-19 19:23:53 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-06-19 19:23:53 +0200 |
| commit | b5967f2c7a765f91386d820c75997940fbdadf39 (patch) | |
| tree | a3dc5aa9c24fc849a0e63d7990d126e224cffaac | |
| parent | 1c16923177ae2dc80cd3fd8bb504ecf91a1f188b (diff) | |
| parent | 0040f93ccd5f4aa6db719741fcd6335c48d1390d (diff) | |
| download | erlang.mk-b5967f2c7a765f91386d820c75997940fbdadf39.tar.gz erlang.mk-b5967f2c7a765f91386d820c75997940fbdadf39.tar.bz2 erlang.mk-b5967f2c7a765f91386d820c75997940fbdadf39.zip | |
Merge branch 'fix-shell-test-warning-in-dep_autopatch' of https://github.com/rabbitmq/erlang.mk
| -rw-r--r-- | core/deps.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/deps.mk b/core/deps.mk index 78ce3ca..8a104f4 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -67,11 +67,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 \ |