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

INTEGRATION: CWS macosx02 (1.39.6); FILE MERGED

Browse source 
2005/02/11 19:01:30 pjanik 1.39.6.2: #i39952#: Add current directory to DYLD_LIBRARY_PATH for MacOS X.
2005/01/31 14:22:38 pjanik 1.39.6.1: #i41722#: Append old PATH to the PATH varible for the environment (Mac OS
X/Darwin).
This commit is contained in:
Vladimir Glazounov 2005-02-24 13:07:05 +00:00
parent a5ac785253
commit b7559b06c4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config_office/set_soenv.in
View file

@ -1,8 +1,8 @@
#!@PERL@ -w
#
# Program: set_soenv.in
# Version: $Revision: 1.46 $
# Date: $Date: 2005-02-21 15:16:50 $
# Version: $Revision: 1.47 $
# Date: $Date: 2005-02-24 14:07:05 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
#
#---------------------------------------------------------------------------
@ -890,8 +890,9 @@ elsif ($platform eq "$Irix" || $platform eq "$Irix64")
$ps.$par_dir.$LIB.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
}
elsif ($platform eq $Macosx)
{ $LD_LIBRARY_PATH = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
elsif ($platform eq "$Macosx")
{ $LD_LIBRARY_PATH = $cur_dir.
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
$ps_STLPORT_LIB;
}
elsif ($platform ne $Winnt )
@ -1140,6 +1141,9 @@ elsif ($platform eq $Macosx)
$ps.$USR_LOCAL.$BIN.
$ps.$USR.$ds."X11R6".$BIN.
$ps.$USR_LOCAL.$ds."sbin";
# Append old PATH
$PATH .= $ps.$oldPATH;
# PATHEXTRA variable for Macosx.
$PATHEXTRA = $USR_BIN.