summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-12-19 03:47:44 +0000
committerJoshua Colp <jcolp@digium.com>2006-12-19 03:47:44 +0000
commit83d3b6adda2ce62022591eba28e56d83a5da2e5e (patch)
treeba0a0c2fc14806f4bcfc534650ae442d20246301 /Makefile
parent02e21cb5f200e58948a85119e8ae0d000f27fa13 (diff)
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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9a2666451..46cce109a 100644
--- a/Makefile
+++ b/Makefile
@@ -678,7 +678,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"
+ @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 ..."