From 1e332468dcef968070158b65ef532789ed6f1713 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Wed, 27 Jul 2011 19:19:46 +0000 Subject: 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 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.moddir_rules') diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index b883548af..fc44d4dad 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -141,7 +141,7 @@ dist-clean:: $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@ echo "" >> $@ -.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS))) +.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(sort $(ALL_C_MODS) $(ALL_CC_MODS)))) @echo "" > $@ @cat $^ >> $@ @echo "" >> $@ -- cgit v1.2.3