Merged revisions 43993 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Fri, 29 Sep 2006 16:38:46 +0000 (16:38 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Fri, 29 Sep 2006 16:38:46 +0000 (16:38 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43993 | kpfleming | 2006-09-29 11:38:27 -0500 (Fri, 29 Sep 2006) | 2 lines

a couple more environment settings that can't leak into the menuselect build

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43994 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 95afb34..0644752 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -646,7 +646,7 @@ menuselect: menuselect/menuselect menuselect-tree
        -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) 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
-       @unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+       @unset CC LD AR RANLIB CFLAGS LDFLAGS && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
        @echo "Generating input for menuselect ..."