diff options
author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-06-12 07:39:57 +0000 |
---|---|---|
committer | Oliver-Rainer Wittmann <orw@apache.org> | 2012-06-12 07:39:57 +0000 |
commit | 153c8eeaf433436ad80c2a8b7edb084d844be79c (patch) | |
tree | d4018e250e191985ab94eb1977d8aaf601d145d7 /set_soenv.in | |
parent | 61491195325ddb2856c41587d4d60e07a8adc4ae (diff) |
follow-up on not mixing $OUTPATH with $INPATH
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'set_soenv.in')
-rw-r--r-- | set_soenv.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/set_soenv.in b/set_soenv.in index 1ea51ce6c362..3941251bb6fd 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -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 |