[asterisk-commits] file: trunk r48572 - in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Dec 18 21:47:44 2006
New Revision: 48572

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48572
Log:
Merged revisions 48571 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48571 | file | 2006-12-18 22:46:12 -0500 (Mon, 18 Dec 2006) | 2 lines

Use env -i to start a fresh environment when going to build menuselect. This is more portable then using unset. (issue #8543 reported by jtodd)

........

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?view=diff&rev=48572&r1=48571&r2=48572
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Dec 18 21:47:44 2006
@@ -678,7 +678,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"
+	@env -i && $(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 ..."