summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-16 23:19:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-16 23:19:13 +0200
commitaa7852d5aa0dece9febf874ec3ed7e8cc80810d4 (patch)
tree17ccb62f2d03a58bed3bdf054e879f01a0bbf3a6 /odk
parentb346371f7b5cb9476a41f377ce1b914de8ac077e (diff)
Move the non-Darwin way to determine OO_SDK_URE_HOME to where it belongs
Change-Id: Iedd35be577835a24c8d593859b1c1086d1e1ae92
Diffstat (limited to 'odk')
-rwxr-xr-xodk/config/configure.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 19f8f2112156..83842e80b262 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 "" ) {