From: Russell Bryant Date: Thu, 5 May 2011 23:47:23 +0000 (+0000) Subject: Merged revisions 317530 via svnmerge from X-Git-Tag: 11.0.0-beta1~1622 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b802909d071680f00391a4066fbbd02175aed153;p=thirdparty%2Fasterisk.git Merged revisions 317530 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317530 | russell | 2011-05-05 18:46:54 -0500 (Thu, 05 May 2011) | 10 lines If the configure script runs, force a rebuild of menuselect-tree. Some contents in the menuselect tree are dependent on configure script parameters, namely --enable-dev-mode. (closes issue #17219) Reported by: Nick_Lewis Patches: issue_17219.rev1.txt uploaded by russell (license 2) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317531 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 2f3d46659a..b0d016709b 100644 --- a/Makefile +++ b/Makefile @@ -924,7 +924,7 @@ menuselect/nmenuselect: menuselect/makeopts menuselect/makeopts: makeopts +$(MAKE_MENUSELECT) makeopts -menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure +menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure makeopts @echo "Generating input for menuselect ..." @echo "" > $@ @echo >> $@