diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-03-04 07:04:13 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-04 07:04:13 -0600 |
| commit | 6e58f83d8d68045574bcb432c74f38183a559bab (patch) | |
| tree | 7abcb3be453f17c21d67e91bb4bd4a783ff3c0e0 /third-party | |
| parent | cb70ed72148664b477bb911879616a343e13006c (diff) | |
| parent | 7cf7b0a4f97d32de8620391d2ab7da5ab959d243 (diff) | |
Merge "third_party/Makefile.rules: Replace unsupported != operator with $(shell ...)" into 13
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),) |