ooo-build r14305 - branches/ooo-build-3-0/patches/dev300

[rengelhard svn gnome org]

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

Log:
this one's better

Modified:
   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:15:41 2008
@@ -81,24 +81,24 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
        $EPM_FLAGS      = "-a arm";
     }
-@@ -576,10 +576,17 @@
-         }
+        }
        }
  
 -      $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
 -      $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";
++      # OpenJDK
 +      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 {
++        $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
 +        $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 {
 +      }
     }