dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 246709 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r246709 | tilghman | 2010-02-15 17:42:33 -0600 (Mon, 15 Feb 2010) | 5 lines
  
  Make the menuselect instructions correct by allowing 'make menuselect' to actually solve dependency problems.
  
  (Previously, it would fail out again with the same message about running
  'make menuselect', which was NOT at all helpful.)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@246710 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2010-02-15 23:43:28 +00:00
parent 665ac28114
commit 1a4a99a3c6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -374,8 +374,10 @@ makeopts: configure
@exit 1
menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
ifeq ($(filter %menuselect,$(MAKECMDGOALS)),)
menuselect/menuselect --check-deps $@
menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
endif
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
+@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules