[Libreoffice-commits] .: Branch 'libreoffice-3-3' - odk/configure.pl odk/setsdkenv_unix

[Caolán McNamara]

 odk/configure.pl   |    4 ++--
 odk/setsdkenv_unix |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2d12bb08ba409641ba901fc9d75d537a200763e7
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Fri Nov 5 15:11:47 2010 +0100

    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.
    (cherry picked from commit 1baa1c1671f9396e0e8cb4bde7c62e509da1d548)

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