[svn-commits] tilghman: branch 1.6.0 r246711 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Feb 15 17:44:46 2010
New Revision: 246711

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile?view=diff&rev=246711&r1=246710&r2=246711
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Mon Feb 15 17:44:46 2010
@@ -357,8 +357,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+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules