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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59274 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/Makefile b/apps/Makefile
index 4b0b7a39e24a04108e791cf49cf18e2acd39d83d..d0e9215afbd6652bfe5a5c90ea0d9a85edc6c058 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -21,11 +21,14 @@ ifneq ($(findstring apps,$(MENUSELECT_EMBED)),)
   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))