From: George Joseph Date: Thu, 3 Mar 2016 23:34:51 +0000 (-0700) Subject: third_party/Makefile.rules: Replace unsupported != operator with $(shell ...) X-Git-Tag: 14.0.0-beta1~358^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37472f7398626742fe0f426ca3a55124bcef4e45;p=thirdparty%2Fasterisk.git 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 --- diff --git a/third-party/Makefile.rules b/third-party/Makefile.rules index ac4189ac4d..e633e0e989 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),)