[asterisk-addons-commits] seanbright: branch 1.6.0 r663 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Asterisk addons project]

Author: seanbright
Date: Fri Sep 12 13:21:53 2008
New Revision: 663

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=663
Log:
Merged revisions 662 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

........
r662 | seanbright | 2008-09-12 14:19:17 -0400 (Fri, 12 Sep 2008) | 1 line

Forgot about menuselect.makeopts
........

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Sep 12 13:21:53 2008
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659
+/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659,662

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/Makefile?view=diff&rev=663&r1=662&r2=663
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Fri Sep 12 13:21:53 2008
@@ -123,8 +123,8 @@
 	@echo "****"
 	@exit 1
 
-menuselect.makeopts: menuselect/menuselect menuselect-tree
-	menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
+menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts
+	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
 	@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules