[Libreoffice-commits] .: solenv/bin

[Lubos Lunak]

 solenv/bin/linkoo |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 618e7312633aa110ee146f61545a72293febd811
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Jan 21 15:51:56 2011 +0100

    make ooenv work even when not invoked when in its directory

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 8a29188..297a736 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -40,12 +40,12 @@ use strict;
 # ends up in program/ooenv
 ( my $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
 my $env_script = '
-java_path=`../basis-link/ure-link/bin/javaldx 2>/dev/null`
-export LD_LIBRARY_PATH=".:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
+java_path=`$thisdir/../basis-link/ure-link/bin/javaldx 2>/dev/null`
+export LD_LIBRARY_PATH="$thisdir:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
 ulimit -c unlimited
-export PATH=".:../basis-link/program:../basis-link/ure-link/bin:$PATH"
+export PATH="$thisdir/:$thisdir/../basis-link/program:$thisdir/../basis-link/ure-link/bin:$PATH"
 export GNOME_DISABLE_CRASH_DIALOG=1
-export STAR_RESOURCEPATH=`pwd`/../basis-link/program/resource
+export STAR_RESOURCEPATH=$thisdir/../basis-link/program/resource
 # debugging assistance
 export G_SLICE=always-malloc
 export MALLOC_CHECK_=2
@@ -384,6 +384,7 @@ if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
     my $ooenv;
     print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n";
     open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!";
+    print $ooenv "thisdir=$OOO_INSTALL/" . $brand_program_dir . "/\n";
     print $ooenv $env_script;
     print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n";
     close ($ooenv);