Kaydet (Commit) 53125e89 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Set JAVA_HOME before it is used

üst 1f6be706
...@@ -128,6 +128,12 @@ $EPM_FLAGS = ""; ...@@ -128,6 +128,12 @@ $EPM_FLAGS = "";
$CL_X64 = '@CL_X64@'; $CL_X64 = '@CL_X64@';
$GNUMAKE = "@GNUMAKE@"; $GNUMAKE = "@GNUMAKE@";
# JAVA_HOME as argument from autoconf.
$JAVA_HOME = PathFormat('@JAVA_HOME@') ;
if ( $platform =~ m/cygwin/ ) {
$JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any.
}
# #
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# IV. Initialise the warning container and print a note to the user. # IV. Initialise the warning container and print a note to the user.
...@@ -797,13 +803,6 @@ $SRC_ROOT = PathFormat($SRC_ROOT); ...@@ -797,13 +803,6 @@ $SRC_ROOT = PathFormat($SRC_ROOT);
CheckPathExist( $SRC_ROOT ); CheckPathExist( $SRC_ROOT );
# 2. Java home directory.
# JAVA_HOME as argument from autoconf.
$JAVA_HOME = PathFormat('@JAVA_HOME@') ;
if ( $platform =~ m/cygwin/ ) {
$JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any.
}
# 3. bash path. # 3. bash path.
$OOO_SHELL = '@BASH@'; $OOO_SHELL = '@BASH@';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment