mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 19:28:53 +00:00
Add ASTSBINDIR to the list of configurable paths
This patch also makes astdb2sqlite3 and astcanary use the configured directory instead of relying on $PATH. (closes issue ASTERISK-18959) Review: https://reviewboard.asterisk.org/r/1613/ ........ Merged revisions 347344 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@347345 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
4
Makefile
4
Makefile
@@ -40,6 +40,8 @@ export ASTERISKVERSIONNUM
|
||||
# DESTDIR is the staging (or final) directory where files are copied
|
||||
# during the install process. Define it before 'export', otherwise
|
||||
# export will set it to the empty string making ?= fail.
|
||||
# Trying to run asterisk from the DESTDIR is completely unsupported
|
||||
# behavior.
|
||||
# WARNING: do not put spaces or comments after the value.
|
||||
DESTDIR?=$(INSTALL_PATH)
|
||||
export DESTDIR
|
||||
@@ -405,7 +407,7 @@ $(MOD_SUBDIRS):
|
||||
$(OTHER_SUBDIRS):
|
||||
+@_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
|
||||
|
||||
defaults.h: makeopts
|
||||
defaults.h: makeopts build_tools/make_defaults_h
|
||||
@build_tools/make_defaults_h > $@.tmp
|
||||
@cmp -s $@.tmp $@ || mv $@.tmp $@
|
||||
@rm -f $@.tmp
|
||||
|
Reference in New Issue
Block a user