[Asterisk-code-review] BuildSystem: AC PATH PROG sets to colon character when not f... (asterisk[15])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/8420 )

Change subject: BuildSystem: AC_PATH_PROG sets to colon character when not found.
......................................................................

BuildSystem: AC_PATH_PROG sets to colon character when not found.

ASTERISK-27715
Reported by: Corey Farrell

Change-Id: I0d6d9572d1352dc7ad30c9917173f1e980d8c938
---
M Makefile
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/Makefile b/Makefile
index a11c8de..3e672cc 100644
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,7 @@
   _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
 endif
 
-ifneq ($(GREP),)
+ifneq ($(GREP),:)
   ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)
 endif
 ifneq ($(AWK),)
@@ -467,7 +467,7 @@
 		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/rest-api" ; \
 	done
 
-ifneq ($(GREP),)
+ifneq ($(GREP),:)
   XML_core_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
 endif
 
@@ -486,7 +486,7 @@
 	@echo
 	@echo "</docs>" >> $@
 
-ifneq ($(GREP),)
+ifneq ($(GREP),:)
   XML_full_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
 endif
 
@@ -630,7 +630,7 @@
 	fi
 
 ld-cache-update:
-ifneq ($(LDCONFIG),)
+ifneq ($(LDCONFIG),:)
 ifeq ($(DESTDIR),)  # DESTDIR means binary archive creation; ldconfig should be run on postinst
 	@if [ $$(id -u) -eq 0 ] ; then \
 		$(LDCONFIG) "$(ASTLIBDIR)/" ; \
@@ -976,7 +976,7 @@
 	rm -f $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
 endif
 	$(MAKE) -C sounds uninstall
-ifneq ($(LDCONFIG),)
+ifneq ($(LDCONFIG),:)
 	$(LDCONFIG) "$(ASTLIBDIR)/" || :
 endif
 

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

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d6d9572d1352dc7ad30c9917173f1e980d8c938
Gerrit-Change-Number: 8420
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180306/5cc869fa/attachment-0001.html>