[Libreoffice] [PATCH] Adapt LibreOffice branding in LibO-SDK user installation script.

Hi all,

I tried to install the LibO-SDK as generated in my build from master, 
and I noted that has some link/mingling with OOo.

there are two small issue:

1) When I try to create the working environment in GNU/Linux, it 
defaults to use the OOo 3 program installation.
I can manually change to the correct LibO one, but then it overwrites an 
existing OOo 3 sdk local installation.
I prepared a patch to ease the problem on GNU/Linux and similar platform.
Patch is attached.

2) The IDL documentation generated during LibO build time points to OOo 
DevGuide on the OOo wiki.
The OOo DevGuide will then points back to IDL api on OOo web sites then, 
so confusing matters a litte...

beppec56.

--
Kind Regards,
Giuseppe Castagno
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
beppec56 at openoffice.org

From 1fff03767d8cfd46b9768353cb9282720c7c318f Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Fri, 5 Nov 2010 15:11:47 +0100
Subject: [PATCH] Adapt LibreOffice branding in LibO-SDK user installation script.

This patch adapt the defaults presented when a user sdk environment is
created in GNU/Linux and similar platforms.
---
 odk/configure.pl   |    4 ++--
 odk/setsdkenv_unix |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/odk/configure.pl b/odk/configure.pl
index 85fae44..3353be6 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -636,9 +636,9 @@ sub searchMacOffice
 
 sub searchoffice
 {
-    my $offset = rindex($main::sdkpath, "/openoffice.org");
+    my $offset = rindex($main::sdkpath, "/libreoffice");
     my $tmpOffice = substr($main::sdkpath, 0, $offset);
-    my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION";
+    my $officepath = "$tmpOffice/libreoffice";
 
 #      if ( $main::OO_MINORVERSION > 0) {
 #              $officepath = "$officepath$main::OO_MINORVERSION";
diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix
index 31e0200..6b0dd7c 100755
--- a/odk/setsdkenv_unix
+++ b/odk/setsdkenv_unix
@@ -10,7 +10,7 @@ if [ "$OSTYPE" = "Darwin" ]
 then
     OO_SDK_NAME=`basename $OO_SDK_HOME`
 else
-    OO_SDK_NAME=openoffice.org${OOVERSION}_sdk
+    OO_SDK_NAME=libreoffice${OOVERSION}_sdk
 fi
 
 export OO_SDK_HOME
-- 
1.6.3.3