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

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Mar 27 18:03:09 2007
New Revision: 59274

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59274
Log:
Merged revisions 59273 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59273 | russell | 2007-03-27 18:02:12 -0500 (Tue, 27 Mar 2007) | 4 lines

Fix app_directory when ODBC_STORAGE is being used.  The Makefile did not
properly ensure that this information got copied from what was selected
for app_voicemail.  (issue #9224)

........

Modified:
    trunk/   (props changed)
    trunk/apps/Makefile

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

Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?view=diff&rev=59274&r1=59273&r2=59274
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Tue Mar 27 18:03:09 2007
@@ -21,11 +21,14 @@
   LOADABLE_MODS:=
 endif
 
+MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
 ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
 MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
+MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
 endif
 ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
 MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
+MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
 endif
 
 ifeq (SunOS,$(shell uname))