Index: set_soenv.in
===================================================================
RCS file: /cvs/oo/tools/config_office/set_soenv.in,v
retrieving revision 1.3.2.2.2.8.2.3
diff -u -r1.3.2.2.2.8.2.3 set_soenv.in
--- set_soenv.in	7 Feb 2003 05:21:51 -0000	1.3.2.2.2.8.2.3
+++ set_soenv.in	14 Feb 2003 01:51:25 -0000
@@ -581,9 +581,6 @@
       $OS             = "MACOSX";
       $PATH_SEPERATOR = $ps;
       $PROSWITCH      = "-DPRODUCT";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
       # GUIBASE is set below; may be "aqua" or "unx".
 }
 if ($platform eq $Winnt)
@@ -916,12 +913,8 @@
                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
 }
 elsif ($platform eq $Macosx)
-{  $LD_LIBRARY_PATH   = '$SOLARENV'.$ds.'$INPATH'.$LIB.
-                        $ps_STLPORT_LIB.
-                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                        $ps.$JRELIBDIR.
-                        $ps.$JRETOOLKITDIR.
-                        $ps.$JRETHREADDIR;
+{  $LD_LIBRARY_PATH   = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+                        $ps_STLPORT_LIB;
 }
 # Compiler directives.
 if ($platform eq "$Solaris") 
@@ -1207,12 +1200,7 @@
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
 } 
 elsif ($platform eq "$Macosx") 
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
-                        $L.$JRELIBDIR.
-                        $L.$JRETOOLKITDIR.
-                        $L.$JRETHREADDIR.
+{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
                         $L_STLPORT_LIB.
                         $L.$USR_LIB;
 # [ed] 6/15/02 Add in X11 libraries onto the library path