[asterisk-commits] third party/Makefile.rules: Replace unsupported != operator... (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Mar 4 07:04:15 CST 2016


Anonymous Coward #1000019 has submitted this change and it was merged.

Change subject: third_party/Makefile.rules:  Replace unsupported != operator with $(shell ...)
......................................................................


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
---
M third-party/Makefile.rules
1 file changed, 14 insertions(+), 15 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/third-party/Makefile.rules b/third-party/Makefile.rules
index ac4189a..e633e0e 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),)

-- 
To view, visit https://gerrit.asterisk.org/2352
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I16b2e1878a4f91e7e9740abd427f9639f933c479
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>



More information about the asterisk-commits mailing list