mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-02 19:16:15 +00:00
BuildSystem: AC_PATH_PROG sets to colon character when not found.
ASTERISK-27715 Reported by: Corey Farrell Change-Id: I0d6d9572d1352dc7ad30c9917173f1e980d8c938
This commit is contained in:
10
Makefile
10
Makefile
@@ -239,7 +239,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),)
|
||||
@@ -467,7 +467,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
|
||||
|
||||
@@ -486,7 +486,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
|
||||
|
||||
@@ -630,7 +630,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)/" ; \
|
||||
@@ -976,7 +976,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
|
||||
|
||||
|
Reference in New Issue
Block a user