strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS cloph04 (1.124.4); FILE MERGED

Browse source 
2006/11/20 18:17:54 cloph 1.124.4.2: cosmetical fix, end the "*** WARNINGS WERE ISSUED ***" with a newline
2006/11/19 15:06:24 cloph 1.124.4.1: Issue number: #i69782#
Submitted by: cloph
reduce the path-madness on mac... Don't fully rewrite the user's path, but only add the OOo-relevant ones.
This commit is contained in:
Rüdiger Timm 2006-12-01 13:53:16 +00:00
parent 73a2d5d4e4
commit fc96aa7964
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
config_office/set_soenv.in
View file

@ -1,8 +1,8 @@
#!@PERL@ -w
#
# Program: set_soenv.in
# Version: $Revision: 1.126 $
# Date: $Date: 2006-12-01 14:17:17 $
# Version: $Revision: 1.127 $
# Date: $Date: 2006-12-01 14:53:16 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
#
#---------------------------------------------------------------------------
@ -1218,14 +1218,7 @@ elsif ($platform =~ m/darwin/)
{ $PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
$ps.$USR.$BIN.
$ps.$BIN.
$ps.$USR.$ds."sbin".
$ps.$ds."sbin".
$ps.'$SOLARENV'.$BIN.
$ps.$USR_LOCAL.$BIN.
$ps.$USR.$ds."X11R6".$BIN.
$ps.$USR_LOCAL.$ds."sbin";
# Append old PATH
$PATH .= $ps.$oldPATH;
@ -2088,7 +2081,7 @@ if ( "@USE_SHELL@" ne "4nt" ) {
print "You may now run ./bootstrap in $SRC_ROOT\n";
}
if ( $Warning ne "" ) {
print "***** WARNINGS ISSUED *****";
print "***** WARNINGS ISSUED *****\n";
}
#