[asterisk-commits] qwell: branch 1.4 r234255 - /branches/1.4/Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Dec 10 14:58:09 2009
New Revision: 234255

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=234255
Log:
Fix unselecting of menuselect options via GLOBAL_MAKEOPTS and USER_MAKEOPTS.

(closes issue #16296)
Reported by: abelbeck
Patches:
      issue16296-20091210.diff uploaded by qwell (license 4)
(abelbeck described a fix, which I expanded upon)
Tested by: abelbeck, qwell, lmadsen

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/Makefile?view=diff&rev=234255&r1=234254&r2=234255
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Thu Dec 10 14:58:09 2009
@@ -323,6 +323,7 @@
 	@exit 1
 
 menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+	menuselect/menuselect --check-deps $@
 	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
@@ -748,11 +749,11 @@
 
 gmenuconfig: gmenuselect
 
-menuselect: menuselect/menuselect menuselect-tree
-	- at menuselect/menuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
-
-gmenuselect: menuselect/gmenuselect menuselect-tree
-	- at menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+menuselect: menuselect/menuselect menuselect-tree menuselect.makeopts
+	- at menuselect/menuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
+gmenuselect: menuselect/gmenuselect menuselect-tree menuselect.makeopts
+	- at menuselect/gmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
 	@CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"