diff options
| author | Loïc Hoguin <[email protected]> | 2015-06-21 21:16:18 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-06-21 21:16:18 +0200 |
| commit | 754530904901304f55716db3bf164795343e99c5 (patch) | |
| tree | 06a856bebfb00e282c39a3c693657114860abe80 /core/deps.mk | |
| parent | f2cd401b7dc23b66fff5ff3a6d95ddb44338de02 (diff) | |
| download | erlang.mk-754530904901304f55716db3bf164795343e99c5.tar.gz erlang.mk-754530904901304f55716db3bf164795343e99c5.tar.bz2 erlang.mk-754530904901304f55716db3bf164795343e99c5.zip | |
Fix autopatch issues introduced in recent merges
The good news is that these changes work with FreeBSD,
as opposed to before the merges.
Diffstat (limited to 'core/deps.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 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 \ |