diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-10-01 18:30:42 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-10-01 18:30:42 +0000 |
| commit | f2fb8e6f7922ca2692d8d12422e533e23b444af2 (patch) | |
| tree | b793ada0ba5273d1be02699deb282d257c9976ec | |
| parent | 8a5cf101217cd1c42fb56264b2f1dd5d2fafb79b (diff) | |
Merged revisions 44125 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44125 | russell | 2006-10-01 14:30:06 -0400 (Sun, 01 Oct 2006) | 6 lines
Fix a problem that cuased AST_DATA_DIR in defaults.h to be empty. The cause is
that since ASTDATADIR is explicitly exported using "export ASTDATADIR" at the
top of the Makefile, make no longer considers the variable "undefined", so the
Makefile can't use ?= to set ASTDATADIR if not yet set.
(issue #8063, reported by akohlsmith, fixed by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -109,7 +109,9 @@ else ASTVARLIBDIR=$(localstatedir)/lib/asterisk endif endif -ASTDATADIR?=$(ASTVARLIBDIR) +ifeq ($(ASTDATADIR),) + ASTDATADIR:=$(ASTVARLIBDIR) +endif # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk |