odk/config/configure.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit aa7852d5aa0dece9febf874ec3ed7e8cc80810d4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 16 23:19:13 2014 +0200
Move the non-Darwin way to determine OO_SDK_URE_HOME to where it belongs
Change-Id: Iedd35be577835a24c8d593859b1c1086d1e1ae92
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 19f8f21..83842e8 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -43,9 +43,6 @@ $main::OO_SDK_HOME_SUGGESTION = $main::sdkpath;
$main::OFFICE_HOME = "";
-$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
-chomp($main::OO_SDK_URE_HOME);
-
$main::OO_SDK_MAKE_HOME = "";
$main::makeName = "make";
if ( $main::operatingSystem =~ m/solaris/ ||
@@ -131,6 +128,9 @@ if ( $main::operatingSystem =~ m/darwin/ )
}
} else
{
+ $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
+ chomp($main::OO_SDK_URE_HOME);
+
$main::OFFICE_HOME_SUGGESTION = searchoffice();
if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
