aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-27 23:03:09 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-27 23:03:09 +0000
commit32410c27a10398a5d354d0e6b75d6a86040c0d15 (patch)
treedda1b02dbff4ddc35c45a7f2291bfc1360d17c29 /apps
parent3f91e07985f6f4f33fdf20cf0e0e7088ea8cf76c (diff)
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: http://svn.digium.com/svn/asterisk/trunk@59274 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 4b0b7a39e..d0e9215af 100644
--- 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))