[asterisk-commits] kpfleming: trunk r43994 - in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Sep 29 11:38:46 2006
New Revision: 43994

URL: http://svn.digium.com/view/asterisk?rev=43994&view=rev
Log:
Merged revisions 43993 via svnmerge from 
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

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=43994&r1=43993&r2=43994&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Sep 29 11:38:46 2006
@@ -646,7 +646,7 @@
 	- at 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 ..."