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/branches/1.4@44125 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index e72fbf4373938ebaad0690ab663b16babb5b3c41..fc130f6ec0f6de7e71e18c273b8bf239ef823ec9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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