Index: set_soenv.1
===================================================================
RCS file: /cvs/oo/tools/config_office/set_soenv.1,v
retrieving revision 1.61.2.9.2.5
diff -u -r1.61.2.9.2.5 set_soenv.1
--- set_soenv.1	21 Nov 2002 21:41:39 -0000	1.61.2.9.2.5
+++ set_soenv.1	9 Feb 2003 14:28:48 -0000
@@ -578,9 +578,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)
@@ -948,8 +945,7 @@
                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
 }
 elsif ($platform eq $Macosx)
-{  $LD_LIBRARY_PATH   = '$SOLARENV'.$ds.'$INPATH'.$LIB.
-			$ps_STLPORT_LIB.
+{  $LD_LIBRARY_PATH   = $ps_STLPORT_LIB.
                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
 }
 # Compiler directives.
@@ -1223,12 +1219,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