From: Alexander Traud <pabstraud@compuserve.com>
Date: Mon, 5 Mar 2018 09:42:10 +0000 (+0100)
Subject: BuildSystem: AC_PATH_PROG sets to colon character when not found.
X-Git-Tag: 13.21.0-rc1~90^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95ecbaa6b8820ae0103ad6a8bc0db193edbf32e2;p=thirdparty%2Fasterisk.git

BuildSystem: AC_PATH_PROG sets to colon character when not found.

ASTERISK-27715
Reported by: Corey Farrell

Change-Id: I0d6d9572d1352dc7ad30c9917173f1e980d8c938
---

diff --git a/Makefile b/Makefile
index f24e8b1af9..b66124715d 100644
--- a/Makefile
+++ b/Makefile
@@ -240,7 +240,7 @@ ifeq ($(OSARCH),SunOS)
   _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 @@ endif
 		$(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 @@ doc/core-en_US.xml: makeopts .lastclean $(XML_core_en_US)
 	@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 @@ oldmodcheck:
 	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 @@ ifeq ($(HAVE_DAHDI),1)
 	rm -f $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
 endif
 	$(MAKE) -C sounds uninstall
-ifneq ($(LDCONFIG),)
+ifneq ($(LDCONFIG),:)
 	$(LDCONFIG) "$(ASTLIBDIR)/" || :
 endif