odk: let configure find the office path by default on dev-install

Change-Id: I50a698a16b8487945b4928d2c0e1c33c00c7641d

1 files changed, 7 insertions, 0 deletions

diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 04bfb4bfb076..588f80bf45ef 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -734,6 +734,13 @@ sub searchoffice
         return $officepath;
     }
 
+    # Before trying versioned directories, check if the sdk is directly under
+    # the office path.
+    $officepath = $main::sdkpath . "/..";
+    if (-d $officepath && -e "$officepath/program/soffice") {
+        return $officepath;
+    }
+
     my $tmpversion = $main::OO_MAJORVERSION + 6;
     if ( $main::OO_MINORVERSION > 0) {
         $tmpversion = "$tmpversion.$main::OO_MINORVERSION";