diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-10 20:58:09 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-10 20:58:09 +0000 |
| commit | 54bb4740fc85e58b82ff8e8278969913da992531 (patch) | |
| tree | d6446f91e395d90b6ae28b203649ff577a17f93b | |
| parent | bfd9af9b0e9d965ba9f5f6c7479f9a3fab0449fd (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@234255 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -323,6 +323,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): @@ -748,11 +749,11 @@ menuconfig: menuselect gmenuconfig: gmenuselect -menuselect: menuselect/menuselect menuselect-tree - -@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!" +menuselect: menuselect/menuselect menuselect-tree menuselect.makeopts + -@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/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!" 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" |