[asterisk-commits] murf: branch murf/bug7804 r41135 - /team/murf/bug7804/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Fri Aug 25 14:38:35 2006
New Revision: 41135

URL: http://svn.digium.com/view/asterisk?rev=41135&view=rev
Log:
Merged revisions 41133 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r41133 | russell | 2006-08-25 13:10:15 -0600 (Fri, 25 Aug 2006) | 2 lines

fix redirect typo

........

Modified:
    team/murf/bug7804/   (props changed)
    team/murf/bug7804/configure
    team/murf/bug7804/configure.ac

Propchange: team/murf/bug7804/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 25 14:38:35 2006
@@ -1,1 +1,1 @@
-/trunk:1-41122
+/trunk:1-41134

Modified: team/murf/bug7804/configure
URL: http://svn.digium.com/view/asterisk/team/murf/bug7804/configure?rev=41135&r1=41134&r2=41135&view=diff
==============================================================================
--- team/murf/bug7804/configure (original)
+++ team/murf/bug7804/configure Fri Aug 25 14:38:35 2006
@@ -4864,7 +4864,7 @@
 echo '01234567890123456789012345678901C.h:' >> testMakefile
 echo '01234567890123456789012345678901SK.cc:' >> testMakefile
 echo '01234567890123456789012345678901DynSK.cc:' >> testMakefile
-$GNU_MAKE -r -f testMakefile 2&>1 > /dev/null
+$GNU_MAKE -r -f testMakefile 2>&1 > /dev/null
 if test "$?" != "0" ; then
   rm -f testMakefile
   { echo "$as_me:$LINENO: ********** ERROR **********" >&5

Modified: team/murf/bug7804/configure.ac
URL: http://svn.digium.com/view/asterisk/team/murf/bug7804/configure.ac?rev=41135&r1=41134&r2=41135&view=diff
==============================================================================
--- team/murf/bug7804/configure.ac (original)
+++ team/murf/bug7804/configure.ac Fri Aug 25 14:38:35 2006
@@ -118,7 +118,7 @@
 echo '01234567890123456789012345678901C.h:' >> testMakefile
 echo '01234567890123456789012345678901SK.cc:' >> testMakefile
 echo '01234567890123456789012345678901DynSK.cc:' >> testMakefile
-$GNU_MAKE -r -f testMakefile 2&>1 > /dev/null
+$GNU_MAKE -r -f testMakefile 2>&1 > /dev/null
 if test "$?" != "0" ; then
   rm -f testMakefile
   AC_MSG_NOTICE(********** ERROR **********)