diff options
| -rwxr-xr-x | set_soenv.in | 7 | ||||
| -rwxr-xr-x | solenv/bin/modules/SourceConfig.pm | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/set_soenv.in b/set_soenv.in index 098e2ebad99b..403a039eb0d7 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -74,7 +74,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV # Environment variables. my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, - $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , + $UPD, $WORK_STAMP, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $SOLARDEFIMG, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, @@ -1010,10 +1010,6 @@ if ( $platform =~ m/darwin/ ) $WORK_STAMP = "@SOURCEVERSION@"; # Location of the source. $SOLARSRC = '$SRC_ROOT'; -# Location of the repository. -my @splitlist = split( /\//, $SRC_ROOT ); -pop @splitlist; -$SOURCE_ROOT_DIR = join("/", @splitlist); # default TARFILE_LOCATION if ('@TARFILE_LOCATION@' eq "DEFAULT") @@ -1981,7 +1977,6 @@ if ($platform !~ m/cygwin|os2/) { } } ToFile( "SOLARSRC", $SOLARSRC, "e" ); -ToFile( "SOURCE_ROOT_DIR", $SOURCE_ROOT_DIR, "e" ); if ( $platform =~ m/cygwin/ ) { ToFile( "ILIB", $ILIB, "e" ); diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index dfaa797d8f48..29f2b2fefe6d 100755 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -76,7 +76,7 @@ sub new { $source_root .= '/..'; } } else { - $source_root = $ENV{SOURCE_ROOT_DIR}; + $source_root = $ENV{SRC_ROOT}; }; $source_root = Cwd::realpath($source_root); $self->{SOURCE_ROOT} = $source_root; |