diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2010-11-05 15:11:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-08 13:26:15 +0000 |
| commit | db27fafe1f31c0be32d9edeb3f2c4776f7097359 (patch) | |
| tree | 984bac4cf7e95be12fd2219a10ad164bc362e791 | |
| parent | e6c68c3eed472aef1c116d27ff6e35e52622463d (diff) | |
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)
| -rwxr-xr-x | odk/configure.pl | 4 | ||||
| -rwxr-xr-x | odk/setsdkenv_unix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/odk/configure.pl b/odk/configure.pl index 11f5987cb94a..c02755c56772 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 31e0200eb1b7..6b0dd7c18683 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 |