diff options
| author | Terry Wilson <twilson@digium.com> | 2011-12-07 20:15:29 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-12-07 20:15:29 +0000 |
| commit | 980ab2d018086aa7663b190a4361440a39462bdd (patch) | |
| tree | 6e30766b047d4862f7697913c67d272301e8ef47 /Makefile | |
| parent | 7e634c21f80f88ed6b7b57451a6aef4cb2293d05 (diff) | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |