From 296a4908f198216f185c131caa492623964fcfbe Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Thu, 10 Dec 2009 21:03:40 +0000 Subject: [PATCH] Merged revisions 234256 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r234256 | qwell | 2009-12-10 15:01:39 -0600 (Thu, 10 Dec 2009) | 16 lines Merged revisions 234255 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r234255 | qwell | 2009-12-10 14:58:09 -0600 (Thu, 10 Dec 2009) | 9 lines 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@234258 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a4244ab952..62e85e9f98 100644 --- a/Makefile +++ b/Makefile @@ -359,6 +359,7 @@ makeopts: configure @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): @@ -858,14 +859,14 @@ menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect echo "'make menuselect'."; \ fi -cmenuselect: menuselect/cmenuselect menuselect-tree - -@menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" +cmenuselect: menuselect/cmenuselect menuselect-tree menuselect.makeopts + -@menuselect/cmenuselect 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/gmenuselect 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 menuselect.makeopts + -@menuselect/gmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" -nmenuselect: menuselect/nmenuselect menuselect-tree - -@menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" +nmenuselect: menuselect/nmenuselect menuselect-tree menuselect.makeopts + -@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" # options for make in menuselect/ MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"