ooo-build r14304 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Oct 14 06:13:04 2008
New Revision: 14304
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14304&view=rev

Log:
* patches/dev300/config_office-openjdk-paths.diff: fix mips

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff

Modified: branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff	Tue Oct 14 06:13:04 2008
@@ -81,12 +81,25 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
        $EPM_FLAGS      = "-a arm";
     }
-@@ -577,7 +579,7 @@
+@@ -576,10 +576,17 @@
+         }
        }
-
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+ 
+-      $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
 -      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
-+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
-       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
+-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
+-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
++      if ($JDK =~ m/sun/) {
++        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
++        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client";
++        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
++        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
++      } else {
++        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
++        $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
++        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
++      } else {
++      }
     }
+ 
+