[svn-commits] russell: branch 1.6.1 r140171 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Aug 26 13:12:24 2008
New Revision: 140171

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140171
Log:
Merged revisions 140169 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r140169 | russell | 2008-08-26 13:11:49 -0500 (Tue, 26 Aug 2008) | 4 lines

Fix building menuselect-tree with PRINT_DIR set.  We _must_ use the --quiet
flag here, or else some arbitrary text will end up in the resulting
menuselect-tree file and things will explode.

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/Makefile?view=diff&rev=140171&r1=140170&r2=140171
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Tue Aug 26 13:12:24 2008
@@ -900,9 +900,9 @@
 	@echo "<?xml version=\"1.0\"?>" > $@
 	@echo >> $@
 	@echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
-	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
 	@cat build_tools/cflags.xml >> $@
-	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
 	@if [ "${AST_DEVMODE}" = "yes" ]; then \
 		cat build_tools/cflags-devmode.xml >> $@; \
 	fi