diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-03-27 23:03:09 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-03-27 23:03:09 +0000 |
| commit | 469ac557535ab4a7a3826423854c490007a596d5 (patch) | |
| tree | dda1b02dbff4ddc35c45a7f2291bfc1360d17c29 /apps/Makefile | |
| parent | 04f19557818e95c692962cbde4c511d009f52e3e (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: https://origsvn.digium.com/svn/asterisk/trunk@59274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 3 |
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)) |