Skip to content

C
core
Kaydet (Commit) aa7852d5 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Move the non-Darwin way to determine OO_SDK_URE_HOME to where it belongs 

Change-Id: Iedd35be577835a24c8d593859b1c1086d1e1ae92
üst b346371f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
odk/config/configure.pl
Dosyayı görüntüle @ aa7852d5
...@@ -43,9 +43,6 @@ $main::OO_SDK_HOME_SUGGESTION = $main::sdkpath; ...@@ -43,9 +43,6 @@ $main::OO_SDK_HOME_SUGGESTION = $main::sdkpath;
$main::OFFICE_HOME = ""; $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::OO_SDK_MAKE_HOME = "";
$main::makeName = "make"; $main::makeName = "make";
if ( $main::operatingSystem =~ m/solaris/ || if ( $main::operatingSystem =~ m/solaris/ ||
...@@ -131,6 +128,9 @@ if ( $main::operatingSystem =~ m/darwin/ ) ...@@ -131,6 +128,9 @@ if ( $main::operatingSystem =~ m/darwin/ )
} }
} else } else
{ {
$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
chomp($main::OO_SDK_URE_HOME);
$main::OFFICE_HOME_SUGGESTION = searchoffice(); $main::OFFICE_HOME_SUGGESTION = searchoffice();
if ( $main::OFFICE_HOME_SUGGESTION eq "" ) { if ( $main::OFFICE_HOME_SUGGESTION eq "" ) {
......
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