ooo-build r14621 - in branches/ooo-build-3-0: . patches/mono

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Nov 26 23:36:42 2008
New Revision: 14621
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14621&view=rev

Log:
2008-11-26  Jo Shields  <directhex apebox org>

       * patches/mono/mono-build.diff: remove errorneous line which resets
         MCS back to '/usr/bin/mcs', even if you've just overridden MCS
         to a different value



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/mono/mono-build.diff

Modified: branches/ooo-build-3-0/patches/mono/mono-build.diff
==============================================================================
--- branches/ooo-build-3-0/patches/mono/mono-build.diff	(original)
+++ branches/ooo-build-3-0/patches/mono/mono-build.diff	Wed Nov 26 23:36:42 2008
@@ -29,7 +29,7 @@
  
      dnl Check mscoree.lib / .NET Frameworks dir
      dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib.
-@@ -1407,10 +1412,61 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+@@ -1407,10 +1412,60 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
  	FRAME_HOME=`cygpath -u "$FRAME_HOME"`
  fi
  AC_SUBST(MIDL_PATH)
@@ -57,7 +57,6 @@
 +			test -z "$MCS" || CSC_PATH=`dirname $MCS`
 +        	fi
 +                AL="$CSC_PATH/al"
-+		MCS="$CSC_PATH/mcs"
 +		if test -x "$MCS" -a -x "$AL"; then
 +			MCS_VERSION=`$MCS --version | cut -d" " -f5`
 +			if test "`echo $MCS_VERSION | cut -d"." -f1`" -gt "1" || \