incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1349190 - /incubator/ooo/trunk/main/set_soenv.in
Date Tue, 12 Jun 2012 08:39:57 GMT
Author: orw
Date: Tue Jun 12 08:39:57 2012
New Revision: 1349190

URL: http://svn.apache.org/viewvc?rev=1349190&view=rev
Log:
follow-up on not mixing $OUTPATH with $INPATH

Modified:
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1349190&r1=1349189&r2=1349190&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Tue Jun 12 08:39:57 2012
@@ -1155,8 +1155,7 @@ if ($platform =~ m/cygwin|os2/)
 # The general environment path.
 if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
 {  $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$BIN;
 
    if ($platform =~ m/solaris/) {
@@ -1185,9 +1184,8 @@ elsif ($platform =~ m/cygwin/)
    my ( $tmppath );
 
    $PATH              = $cur_dir.
-#                        $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
                         $ps.CygFormat($SOLARENV).$ds."bin".
-                        $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
+                        $ps.CygFormat($SOLARENV).$ds.$INPATH.$BIN;
 
    if ( $JAVA_HOME ne "" )
    {
@@ -1318,9 +1316,8 @@ elsif ($platform =~ m/os2/)
    # needed is appended to the end.
 
    $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds."bin".
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN;
+                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN;
 
    if ( $JAVA_HOME ne "" )
    {
@@ -1351,8 +1348,7 @@ elsif ($platform =~ m/os2/)
 
 elsif ($platform =~ m/darwin/)
 {  $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
+                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$BIN;
 
   # Append old PATH



Mime
View raw message