[svn-commits] russell: trunk r44126 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Oct  1 13:30:42 2006
New Revision: 44126

URL: http://svn.digium.com/view/asterisk?rev=44126&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=44126&r1=44125&r2=44126&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Oct  1 13:30:42 2006
@@ -109,7 +109,9 @@
   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