diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-03-04 07:04:15 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-04 07:04:15 -0600 |
commit | ee5a9442a295eedf05b998ef1b5c101832d6673f (patch) | |
tree | 70bbd1734db2638a80ea7d2e33182c7d4dc09ac5 | |
parent | 64c03d4d19a73bec5e71db09cf6ecaf61164e12f (diff) | |
parent | 37472f7398626742fe0f426ca3a55124bcef4e45 (diff) |
Merge "third_party/Makefile.rules: Replace unsupported != operator with $(shell ...)"
-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),) |