[asterisk-commits] kpfleming: branch 1.4 r43993 - /branches/1.4/Makefile

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Fri Sep 29 09:38:28 MST 2006


Author: kpfleming
Date: Fri Sep 29 11:38:27 2006
New Revision: 43993

URL: http://svn.digium.com/view/asterisk?rev=43993&view=rev
Log:
a couple more environment settings that can't leak into the menuselect build

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?rev=43993&r1=43992&r2=43993&view=diff
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Fri Sep 29 11:38:27 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 ..."



More information about the asterisk-commits mailing list