From cd628d626c33d02330f2d46c53790bb4aaa3f5ca Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 15 Feb 2010 23:45:03 +0000 Subject: [PATCH] Merged revisions 246710 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r246710 | tilghman | 2010-02-15 17:43:28 -0600 (Mon, 15 Feb 2010) | 12 lines 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@246713 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index ada85ff498..55af2dedda 100644 --- a/Makefile +++ b/Makefile @@ -369,8 +369,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