[ooo-build-commit] .: odk/configure.pl

Fridrich Strba fridrich at kemper.freedesktop.org
Fri Sep 17 02:40:21 PDT 2010


 odk/configure.pl |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 9b493f3b4c66b7caea74a5187a304455694e5382
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Sep 17 11:32:50 2010 +0200

    odk-configure-honour-ure-link.diff: fix configure.pl

diff --git a/odk/configure.pl b/odk/configure.pl
index 8f3778e..85fae44 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -31,12 +31,7 @@ $main::OFFICE_HOME = "";
 
 $main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
 
-if ( $main::operatingSystem =~ m/darwin/ )
-{
-#	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
-} else {
-    $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
-}
+$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
 chomp($main::OO_SDK_URE_HOME);
 
 $main::OO_SDK_MAKE_HOME = "";


More information about the ooo-build-commit mailing list