diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 16:52:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 16:52:06 +0000 |
| commit | f5477836089f753d698a457178313098ef7b5783 (patch) | |
| tree | 06cfd4921b156b1f6e851a07c48dc3aebb419bfa /config_office | |
| parent | 841559582d0d7a33e7653111fcfbf58e5937ea1c (diff) | |
INTEGRATION: CWS ause079 (1.144.2); FILE MERGED
2007/06/11 14:39:02 hjs 1.144.2.2: RESYNC: (1.144-1.146); FILE MERGED
2007/05/23 08:13:36 hjs 1.144.2.1: #i75902# remove obsolete usage of SOLARROOT
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/set_soenv.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 926a4ec048e6..3e3528886a6e 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.151 $ -# Date: $Date: 2007-06-27 13:59:25 $ +# Version: $Revision: 1.152 $ +# Date: $Date: 2007-06-27 17:52:06 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -76,7 +76,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV # Environment variables. my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $SHELL, $UPD, $SOLARUPD, $WORK_STAMP, $TF_UCB, - $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, + $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, @@ -911,8 +911,6 @@ if ( $platform =~ m/darwin/ ) $SOLARUPD = $UPD; # The project's workstamp. $WORK_STAMP = "@SOURCEVERSION@"; -# Location of the build root. -$SOLARROOT = '$SRC_ROOT'; # Location of the source. $SOLARSRC = '$SRC_ROOT'; # @@ -1683,7 +1681,6 @@ ToFile( "GNUMAKE", "@GNUMAKE@", "e" ); ToFile( "UPD", $UPD, "e" ); ToFile( "SOLARUPD", $SOLARUPD, "e" ); ToFile( "WORK_STAMP", $WORK_STAMP, "e" ); -ToFile( "SOLARROOT", $SOLARROOT, "e" ); ToFile( "SOLARVER", $SOLARVER, "e" ); ToFile( "SOLARVERSION", $SOLARVERSION, "e" ); ToFile( "SOLARENV", $SOLARENV, "e" ); |