diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-06 10:35:54 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-06 10:35:54 -0600 |
| commit | 73846c90faf370fecf4c2dca48f1eb6fbe532705 (patch) | |
| tree | 012113ce5a0b6110299dad32f0dd6284054113aa /Makefile | |
| parent | bc879504101c170f5809a11457694db20a7d1a3d (diff) | |
| parent | b97905aaf20c4d54cdbbe8f2b28c7e479f49a76c (diff) | |
Merge "BuildSystem: AC_PATH_PROG sets to colon character when not found."
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |