Merged revisions 329771 via svnmerge from
authorSean Bright <sean@malleable.com>
Wed, 27 Jul 2011 19:19:46 +0000 (19:19 +0000)
committerSean Bright <sean@malleable.com>
Wed, 27 Jul 2011 19:19:46 +0000 (19:19 +0000)
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 ASTERISK-18141)
    Reported by: Richard Miller
    Patches:
     sort-order.diff uploaded by seanbright (License #5060)
    Tested by: leifmadsen
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile.moddir_rules

index b883548..fc44d4d 100644 (file)
@@ -141,7 +141,7 @@ dist-clean::
        $(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>" >> $@