From: Russell Bryant Date: Tue, 27 Mar 2007 23:02:12 +0000 (+0000) Subject: Fix app_directory when ODBC_STORAGE is being used. The Makefile did not X-Git-Tag: 1.4.7.1~514 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1403e32e25bf59648cde455edab6305f79f5772;p=thirdparty%2Fasterisk.git 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/branches/1.4@59273 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/Makefile b/apps/Makefile index 4b0b7a39e2..d0e9215afb 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))