From fc96aa7964dc5b8733e79e062f6de4a686e6c100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 1 Dec 2006 13:53:16 +0000 Subject: [PATCH] INTEGRATION: CWS cloph04 (1.124.4); FILE MERGED 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. --- config_office/set_soenv.in | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index f70feb2a2687..8dde13dfa3dc 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -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"; } #