[asterisk-commits] seanbright: trunk r329775 - in /trunk: ./ Makefile.moddir_rules

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jul 27 14:19:46 2011
New Revision: 329775

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329775
Log:
Merged revisions 329771 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329771 | seanbright | 2011-07-27 15:18:47 -0400 (Wed, 27 Jul 2011) | 15 lines
  
  Merged revisions 329767 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329767 | seanbright | 2011-07-27 15:17:46 -0400 (Wed, 27 Jul 2011) | 8 lines
    
    Explicitly sort the module list so that the menuselect lists are sorted.
    
    (closes issue ASTERISK-18141)
    Reported by: Richard Miller
    Patches:
    		sort-order.diff uploaded by seanbright (License #5060)
    Tested by: leifmadsen
  ........
................

Modified:
    trunk/   (props changed)
    trunk/Makefile.moddir_rules

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

Modified: trunk/Makefile.moddir_rules
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile.moddir_rules?view=diff&rev=329775&r1=329774&r2=329775
==============================================================================
--- trunk/Makefile.moddir_rules (original)
+++ trunk/Makefile.moddir_rules Wed Jul 27 14:19:46 2011
@@ -141,7 +141,7 @@
 	$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
 	echo "</member>" >> $@
 
-.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(sort $(ALL_C_MODS) $(ALL_CC_MODS))))
 	@echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" remove_on_change=\"$(SUBDIR)/modules.link\">" > $@
 	@cat $^ >> $@
 	@echo "</category>" >> $@