[asterisk-commits] tilghman: branch 1.4 r246709 - /branches/1.4/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Feb 15 17:42:33 2010
New Revision: 246709

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246709
Log:
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.)

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/Makefile?view=diff&rev=246709&r1=246708&r2=246709
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Feb 15 17:42:33 2010
@@ -323,8 +323,10 @@
 	@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):
 	+ at echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules