[svn-commits] kpfleming: branch markster/usersconf r41179 - in /team/markster/usersconf: ./...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat Aug 26 12:05:52 2006
New Revision: 41179

URL: http://svn.digium.com/view/asterisk?rev=41179&view=rev
Log:
update

Modified:
    team/markster/usersconf/   (props changed)
    team/markster/usersconf/Makefile
    team/markster/usersconf/main/Makefile

Propchange: team/markster/usersconf/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Aug 26 12:05:52 2006
@@ -1,1 +1,1 @@
-/trunk:1-41166
+/trunk:1-41178

Modified: team/markster/usersconf/Makefile
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/Makefile?rev=41179&r1=41178&r2=41179&view=diff
==============================================================================
--- team/markster/usersconf/Makefile (original)
+++ team/markster/usersconf/Makefile Sat Aug 26 12:05:52 2006
@@ -647,7 +647,7 @@
 	- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || 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
-	@$(MAKE) -C menuselect
+	@unset CC LD AR RANLIB && $(MAKE) -C menuselect
 
 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 ..."

Modified: team/markster/usersconf/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/main/Makefile?rev=41179&r1=41178&r2=41179&view=diff
==============================================================================
--- team/markster/usersconf/main/Makefile (original)
+++ team/markster/usersconf/main/Makefile Sat Aug 26 12:05:52 2006
@@ -134,7 +134,7 @@
 	@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
 	@$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(LDFLAGS) $(STATIC_BUILD) -o asterisk $(ASTLINK) $(AST_EMBED_LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o asterisk $(ASTLINK) $(AST_EMBED_LDFLAGS) $(LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
 
 clean::
 	rm -f asterisk