diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-03-03 16:34:51 -0700 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2016-03-03 17:50:51 -0600 |
| commit | 7cf7b0a4f97d32de8620391d2ab7da5ab959d243 (patch) | |
| tree | dfa0931f136d672666a04c481283dba0711d6121 /third-party | |
| parent | d2be16472efa0608c389b467ad69044fbe8e9f5f (diff) | |
third_party/Makefile.rules: Replace unsupported != operator with $(shell ...)
Apparently the != operator is fairly new so I've replaced it with
the old $(shell ...) syntax.
Change-Id: I16b2e1878a4f91e7e9740abd427f9639f933c479
Reported-by: Richard Mudgett
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/Makefile.rules | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/third-party/Makefile.rules b/third-party/Makefile.rules index ac4189ac4..e633e0e98 100644 --- a/third-party/Makefile.rules +++ b/third-party/Makefile.rules @@ -1,25 +1,24 @@ ifeq ($(NOISY_BUILD),) - SUBMAKE?=$(MAKE) --quiet --no-print-directory - ECHO_PREFIX?=@ - CMD_PREFIX?=@ - QUIET_CONFIGURE=-q - REALLY_QUIET=&>/dev/null +SUBMAKE?=$(MAKE) --quiet --no-print-directory +ECHO_PREFIX?=@ +CMD_PREFIX?=@ +QUIET_CONFIGURE=-q +REALLY_QUIET=&>/dev/null else - SUBMAKE?=$(MAKE) - ECHO_PREFIX?=@\# - CMD_PREFIX?= - QUIET_CONFIGURE= - REALLY_QUIET= +SUBMAKE?=$(MAKE) +ECHO_PREFIX?=@\# +CMD_PREFIX?= +QUIET_CONFIGURE= +REALLY_QUIET= endif -DOWNLOAD := -DOWNLOAD != which wget 2>/dev/null -DOWNLOAD:=$(if $(DOWNLOAD),$(DOWNLOAD) -O- ,) +DOWNLOAD := $(shell which wget 2>/dev/null) +DOWNLOAD := $(if $(DOWNLOAD),$(DOWNLOAD) -O- ,) ifeq ($(DOWNLOAD),) -DOWNLOAD != which curl 2>/dev/null -DOWNLOAD:=$(if $(DOWNLOAD), $(DOWNLOAD) -L ,) +DOWNLOAD := $(shell which curl 2>/dev/null) +DOWNLOAD := $(if $(DOWNLOAD), $(DOWNLOAD) -L ,) endif ifeq ($(DOWNLOAD),) |