--- a/src/octave-3-fixes.patch	Fri Jan 11 12:57:08 2013 -0500
+++ b/src/octave-3-fixes.patch	Fri Jan 11 22:33:32 2013 -0500
@@ -1,32 +1,55 @@
 diff --git a/build-aux/common.mk b/build-aux/common.mk
 --- a/build-aux/common.mk
 +++ b/build-aux/common.mk
-@@ -563,7 +563,12 @@
+@@ -1,3 +1,5 @@
++CROSS_TOOL_PREFIX = @CROSS_TOOL_PREFIX@
++
+ AWK = @AWK@
+ export AWK
+ 
+@@ -154,6 +156,13 @@
+ 
+ NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@
+ 
++MKOCTFILE_CC = @MKOCTFILE_CC@
++MKOCTFILE_CXX = @MKOCTFILE_CXX@
++MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@
++MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@
++MKOCTFILE_F77 = @MKOCTFILE_F77@
++MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@
++
+ # List of libraries and their special compilation flags
+ 
+ LIBOCTINTERP = @LIBOCTINTERP@
+@@ -563,7 +572,12 @@
    -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
    -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
    -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"@MKOCTFILE_CC@\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"@MKOCTFILE_CXX@\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"@MKOCTFILE_DL_LD@\"|' \
-   -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"@MKOCTFILE_F77@\"|' \
-+  -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"@MKOCTFILE_LD_CXX@\"|' \
+-  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \
++  -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \
++  -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \
++  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \
++  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \
++  -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \
++  -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \
    -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
    -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
    -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1811,6 +1811,30 @@
+@@ -1811,6 +1811,34 @@
  AC_SUBST(LIBOCTINTERP)
  AC_SUBST(LIBOCTAVE)
  
++
 +if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
-+  MKOCTFILE_CC=`echo $CC | sed "s,$ac_tool_prefix,,"`
-+  MKOCTFILE_CXX=`echo $CXX | sed "s,$ac_tool_prefix,,"`
-+  MKOCTFILE_DL_LD=`echo $DL_LD | sed "s,$ac_tool_prefix,,"`
-+  MKOCTFILE_F77=`echo $F77 | sed "s,$ac_tool_prefix,,"`
-+  MKOCTFILE_LD_CXX=`echo $LD_CXX | sed "s,$ac_tool_prefix,,"`
++  CROSS_TOOL_PREFIX="$ac_tool_prefix"
++  MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")'
++  MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
++  MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")'
++  MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")'
++  MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
 +else
 +  MKOCTFILE_CC="$CC"
 +  MKOCTFILE_CXX="$CXX"
@@ -34,11 +57,13 @@
 +  MKOCTFILE_F77="$F77"
 +  MKOCTFILE_LD_CXX="$LD_CXX"
 +fi
++AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
 +AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
 +AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
 +AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
 +AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
 +AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
++AC_SUBST(CROSS_TOOL_PREFIX)
 +AC_SUBST(MKOCTFILE_CC)
 +AC_SUBST(MKOCTFILE_CXX)
 +AC_SUBST(MKOCTFILE_DL_LD)