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

Alexander Traud asteriskteam at digium.com
Mon Mar 5 03:43:44 CST 2018


Alexander Traud has uploaded this change for review. ( https://gerrit.asterisk.org/8419


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(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/19/8419/1

diff --git a/Makefile b/Makefile
index f24e8b1..b661247 100644
--- a/Makefile
+++ b/Makefile
@@ -240,7 +240,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),)
@@ -468,7 +468,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
 
@@ -487,7 +487,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
 
@@ -631,7 +631,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)/" ; \
@@ -977,7 +977,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/8419
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d6d9572d1352dc7ad30c9917173f1e980d8c938
Gerrit-Change-Number: 8419
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180305/af241bb1/attachment.html>


More information about the asterisk-code-review mailing list