[Libreoffice-commits] .: set_soenv.in

[Tor Lillqvist]

 set_soenv.in |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 53125e89eb279fc816bc2f903d07a66bfd165c6f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Nov 30 23:53:45 2011 +0200

    Set JAVA_HOME before it is used

diff --git a/set_soenv.in b/set_soenv.in
index 5c01664..90fcc0f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -128,6 +128,12 @@ $EPM_FLAGS	= "";
 $CL_X64 = '@CL_X64@';
 $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.
@@ -797,13 +803,6 @@ $SRC_ROOT = PathFormat($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.
 $OOO_SHELL = '@BASH@';