[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply                              |    2 ++
 patches/dev300/odk-configure-honour-ure-link.diff |   16 ++++++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit fe676b1a1ccec1f3d6a98a324e87d0ee9283d39f
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jul 9 20:31:50 2010 +0200

    fix odks configure.pl to honour ure-link
    
    * patches/dev300/apply:
    * patches/dev300/odk-configure-honour-ure-link.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ab452bd..a95d736 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1463,6 +1463,8 @@ psprint_config-no-orig.diff, jholesov
 odk-remove-nonexisting-package.diff, i#105803
 # fix gcj builds. we need to specify the -I.../<os> there, too
 odk-unowinreg-osdir.diff
+# fix configure.pl
+odk-configure-honour-ure-link.diff
 
 [ DebianOnly ]
 open-url-support-iceanimals.diff
diff --git a/patches/dev300/odk-configure-honour-ure-link.diff b/patches/dev300/odk-configure-honour-ure-link.diff
new file mode 100644
index 0000000..4646410
--- /dev/null
+++ b/patches/dev300/odk-configure-honour-ure-link.diff
@@ -0,0 +1,16 @@
+--- odk/configure.pl-old	2010-07-09 16:48:56.000000000 +0200
++++ odk/configure.pl	2010-07-09 16:50:37.000000000 +0200
+@@ -31,12 +31,7 @@
+ 
+ $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 = "";