[svn-commits] russell: trunk r317531 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May  5 18:47:23 2011
New Revision: 317531

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317531
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=317531&r1=317530&r2=317531
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu May  5 18:47:23 2011
@@ -924,7 +924,7 @@
 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 "<?xml version=\"1.0\"?>" > $@
 	@echo >> $@