From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 15 Feb 2010 23:43:28 +0000 (+0000)
Subject: Merged revisions 246709 via svnmerge from
X-Git-Tag: 11.0.0-beta1~3436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ac0713811bb37bb62f55ba7c60712415d177b9c;p=thirdparty%2Fasterisk.git

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/trunk@246710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index a2521017c2..a384458934 100644
--- a/Makefile
+++ b/Makefile
@@ -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